Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2011-06-08 16:39:34 +0000
committerEike Stepper2011-06-08 16:39:34 +0000
commit1c8e86db960d7279a378df0cfe390a9a4e5c5e0c (patch)
tree0a8adc77baf1e8f459ebaadbe412beafbc0332d8 /plugins/org.eclipse.emf.cdo.doc/javadoc
parent56ce3c52f8c9b4b84ed6e2236760883deadd8ca7 (diff)
downloadcdo-1c8e86db960d7279a378df0cfe390a9a4e5c5e0c.tar.gz
cdo-1c8e86db960d7279a378df0cfe390a9a4e5c5e0c.tar.xz
cdo-1c8e86db960d7279a378df0cfe390a9a4e5c5e0c.zip
javadoc
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.doc/javadoc')
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html97
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonTransaction.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonView.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetDataProvider.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOID.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOWithID.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageTypeRegistry.CDOObjectMarker.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionProvider.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOQueryInfo.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOFetchRule.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-use.html18
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/CDOResourceFactory.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourceFactory.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourcePackage.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-use.html16
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesFactory.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesPackage.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-use.html10
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionProvider.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOCollectionLoadingPolicy.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOSession.ExceptionHandler.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-use.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-use.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html24
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.html14
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPushTransaction.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOSavepoint.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOUserTransaction.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXASavepoint.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXATransaction.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOCommitContext.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDODefaultTransactionHandler1.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html9
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html9
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler2.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html17
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserSavepoint.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html41
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html50
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/class-use/CDOUpdatable.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html18
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFetchRuleManager.html17
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOQuery.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html8
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOView.html3
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html14
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html26
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-use.html6
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOStore.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html4
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html7
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOLoadable.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html2
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html5
-rw-r--r--plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html5
96 files changed, 444 insertions, 265 deletions
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
index b2fdbb93f4..035d9a6868 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/index-all.html
@@ -884,7 +884,7 @@ Static variable in interface org.eclipse.emf.cdo.eresource.<A HREF="./org/eclips
Static variable in interface org.eclipse.emf.cdo.eresource.<A HREF="./org/eclipse/emf/cdo/eresource/EresourcePackage.html" title="interface in org.eclipse.emf.cdo.eresource">EresourcePackage</A>
<DD>The number of structural features of the '<em>CDO Resource Node</em>' class. <!
<DT><A HREF="./org/eclipse/emf/cdo/CDOAdapter.html" title="interface in org.eclipse.emf.cdo"><B>CDOAdapter</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>A marker interface for <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>adpters</CODE></A> to indicate that change subscriptions should be registered with the
- repository if they are attached to <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOAdapterPolicy</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>Specifies an adapter policy.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOAddFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.html" title="interface in org.eclipse.emf.cdo.common.revision"><B>CDOAllRevisionsProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>Provides consumers with all <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A> available in an instance of this interface.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOAsyncTransactionHandler</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Asynchronously executes a delegate handler's pre-event methods.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html#CDOAsyncTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandler)"><B>CDOAsyncTransactionHandler(CDOTransactionHandler)</B></A> -
+ repository if they are attached to <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOAdapterPolicy</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>A policy that allows to specify valid <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>Adapter</CODE></A> / <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> combinations.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOAddFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOAddFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDOAllRevisionsProvider.html" title="interface in org.eclipse.emf.cdo.common.revision"><B>CDOAllRevisionsProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>Provides consumers with all <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A> available in an instance of this interface.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOAsyncTransactionHandler</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Asynchronously executes a delegate handler's pre-event methods.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html#CDOAsyncTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandler)"><B>CDOAsyncTransactionHandler(CDOTransactionHandler)</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDOAsyncTransactionHandler</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.html" title="class in org.eclipse.emf.cdo.spi.common"><B>CDOAuthenticationResult</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/spi/common/package-summary.html">org.eclipse.emf.cdo.spi.common</A><DD>The result of an authentication operation.<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.html#CDOAuthenticationResult(java.lang.String, byte[])"><B>CDOAuthenticationResult(String, byte[])</B></A> -
@@ -893,7 +893,8 @@ Constructor for class org.eclipse.emf.cdo.spi.common.<A HREF="./org/eclipse/emf/
<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.html#CDOAuthenticationResult(org.eclipse.net4j.util.io.ExtendedDataInput)"><B>CDOAuthenticationResult(ExtendedDataInput)</B></A> -
Constructor for class org.eclipse.emf.cdo.spi.common.<A HREF="./org/eclipse/emf/cdo/spi/common/CDOAuthenticationResult.html" title="class in org.eclipse.emf.cdo.spi.common">CDOAuthenticationResult</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDOAuthenticator.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDOAuthenticator</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>The front-end of the CDO challenge/response authentication.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOAutoAttacher</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html#CDOAutoAttacher(org.eclipse.emf.cdo.transaction.CDOTransaction)"><B>CDOAutoAttacher(CDOTransaction)</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDOAuthenticator.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDOAuthenticator</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>The front-end of the CDO challenge/response authentication.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOAutoAttacher</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction handler</CODE></A> that automatically attaches cross-referenced objects to the
+ <A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> that contains the referencing <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html#CDOAutoAttacher(org.eclipse.emf.cdo.transaction.CDOTransaction)"><B>CDOAutoAttacher(CDOTransaction)</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction">CDOAutoAttacher</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoBasicSettings()"><B>cdoBasicSettings()</B></A> -
@@ -962,13 +963,13 @@ Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject
<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoConflict()"><B>cdoConflict()</B></A> -
Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOConflictResolver</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A strategy used to customize the default conflict resolution behaviour of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOConflictResolver2</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOContainerFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDODataInput.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDODataInput</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>Provides I/O methods for reading various CDO data types and concepts from streams.<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDODataOutput.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDODataOutput</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>Provides I/O methods for writing various CDO data types and concepts to streams.<DT><A HREF="./org/eclipse/emf/cdo/server/db/CDODBUtil.html" title="class in org.eclipse.emf.cdo.server.db"><B>CDODBUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/db/package-summary.html">org.eclipse.emf.cdo.server.db</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#CDODefaultTransactionHandler()"><B>CDODefaultTransactionHandler()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOConflictResolver.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOConflictResolver</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A strategy used to customize the default conflict resolution behaviour of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOConflictResolver2</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A strategy used to customize the default conflict resolution behaviour of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOContainerFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOContainerFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDODataInput.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDODataInput</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>Provides I/O methods for reading various CDO data types and concepts from streams.<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDODataOutput.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDODataOutput</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>Provides I/O methods for writing various CDO data types and concepts to streams.<DT><A HREF="./org/eclipse/emf/cdo/server/db/CDODBUtil.html" title="class in org.eclipse.emf.cdo.server.db"><B>CDODBUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/db/package-summary.html">org.eclipse.emf.cdo.server.db</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>An empty default implementation of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#CDODefaultTransactionHandler()"><B>CDODefaultTransactionHandler()</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler1</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#CDODefaultTransactionHandler1()"><B>CDODefaultTransactionHandler1()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler1</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>An empty default implementation of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html#CDODefaultTransactionHandler1()"><B>CDODefaultTransactionHandler1()</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler1</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler2</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html#CDODefaultTransactionHandler2()"><B>CDODefaultTransactionHandler2()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler2</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>An empty default implementation of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html#CDODefaultTransactionHandler2()"><B>CDODefaultTransactionHandler2()</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/CDODeltaNotification.html" title="interface in org.eclipse.emf.cdo"><B>CDODeltaNotification</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>This class behaves like the usual EMF Notification except for the following:
@@ -1010,7 +1011,7 @@ Constructor for class org.eclipse.emf.cdo.server.ocl.<A HREF="./org/eclipse/emf/
<DT><A HREF="./org/eclipse/emf/cdo/server/ocl/CDOExtentMap.html" title="class in org.eclipse.emf.cdo.server.ocl"><B>CDOExtentMap</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/ocl/package-summary.html">org.eclipse.emf.cdo.server.ocl</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/server/ocl/CDOExtentMap.html#CDOExtentMap(org.eclipse.emf.cdo.server.ocl.OCLExtentCreator)"><B>CDOExtentMap(OCLExtentCreator)</B></A> -
Constructor for class org.eclipse.emf.cdo.server.ocl.<A HREF="./org/eclipse/emf/cdo/server/ocl/CDOExtentMap.html" title="class in org.eclipse.emf.cdo.server.ocl">CDOExtentMap</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/util/CDOFactory.html" title="interface in org.eclipse.emf.cdo.util"><B>CDOFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOFeatureAnalyzer</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>TODO Simon: JavaDoc<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.Type.html" title="enum in org.eclipse.emf.cdo.common.revision.delta"><B>CDOFeatureDelta.Type</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOFeatureDeltaVisitor</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.html" title="class in org.eclipse.emf.cdo.spi.common.revision"><B>CDOFeatureDeltaVisitorImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.html#CDOFeatureDeltaVisitorImpl()"><B>CDOFeatureDeltaVisitorImpl()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/util/CDOFactory.html" title="interface in org.eclipse.emf.cdo.util"><B>CDOFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOFeatureAnalyzer</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>A call-back interface that is called by a <A HREF="./org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> on each model read access.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDelta.Type.html" title="enum in org.eclipse.emf.cdo.common.revision.delta"><B>CDOFeatureDelta.Type</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOFeatureDeltaVisitor.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOFeatureDeltaVisitor</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.html" title="class in org.eclipse.emf.cdo.spi.common.revision"><B>CDOFeatureDeltaVisitorImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.html#CDOFeatureDeltaVisitorImpl()"><B>CDOFeatureDeltaVisitorImpl()</B></A> -
Constructor for class org.eclipse.emf.cdo.spi.common.revision.<A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDOFeatureDeltaVisitorImpl.html" title="class in org.eclipse.emf.cdo.spi.common.revision">CDOFeatureDeltaVisitorImpl</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDOFeatureMapEntry.html" title="interface in org.eclipse.emf.cdo.spi.common.revision"><B>CDOFeatureMapEntry</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util"><B>CDOFetchRule</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOFetchRule.html#CDOFetchRule(org.eclipse.emf.ecore.EClass)"><B>CDOFetchRule(EClass)</B></A> -
@@ -1019,7 +1020,8 @@ Constructor for class org.eclipse.emf.cdo.common.util.<A HREF="./org/eclipse/emf
<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOFetchRule.html#CDOFetchRule(org.eclipse.emf.cdo.common.protocol.CDODataInput, org.eclipse.emf.cdo.common.model.CDOPackageRegistry)"><B>CDOFetchRule(CDODataInput, CDOPackageRegistry)</B></A> -
Constructor for class org.eclipse.emf.cdo.common.util.<A HREF="./org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util">CDOFetchRule</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOFetchRuleManager</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>TODO Simon: JavaDoc<DT><A HREF="./org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.html" title="class in org.eclipse.emf.cdo.server.hibernate"><B>CDOHibernateUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/hibernate/package-summary.html">org.eclipse.emf.cdo.server.hibernate</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoID()"><B>cdoID()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOFetchRuleManager</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>Collects and updates <A HREF="./org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util"><CODE>fetch rules</CODE></A> for <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A>, usually based on
+ <A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><CODE>feature analyzer</CODE></A> statistics.<DT><A HREF="./org/eclipse/emf/cdo/server/hibernate/CDOHibernateUtil.html" title="class in org.eclipse.emf.cdo.server.hibernate"><B>CDOHibernateUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/hibernate/package-summary.html">org.eclipse.emf.cdo.server.hibernate</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoID()"><B>cdoID()</B></A> -
Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A>
<DD>Returns the <em>technical</em> object identifier of this object, or <code>null</code> if the <A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoState()"><CODE>state</CODE></A> of this object is <A HREF="./org/eclipse/emf/cdo/CDOState.html#TRANSIENT"><CODE>TRANSIENT</CODE></A> or <A HREF="./org/eclipse/emf/cdo/CDOState.html#INVALID"><CODE>INVALID</CODE></A>.
<DT><A HREF="./org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id"><B>CDOID</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/id/package-summary.html">org.eclipse.emf.cdo.common.id</A><DD>Identifies CDO objects uniquely in a CDO <A HREF="./org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/id/CDOWithID.html#cdoID()"><B>cdoID()</B></A> -
@@ -1139,7 +1141,7 @@ Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/CDOInvalidationNotification.html" title="interface in org.eclipse.emf.cdo"><B>CDOInvalidationNotification</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>A custom EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Notification.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>notification</CODE></A> that is emitted to <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>adapters</CODE></A> of the objects in a
<A HREF="./org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> if <A HREF="./org/eclipse/emf/cdo/view/CDOView.Options.html#setInvalidationNotificationEnabled(boolean)"><CODE>invalidation notification</CODE></A> is
- enabled for the view.<DT><A HREF="./org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOInvalidationPolicy</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/ui/CDOItemProvider.html" title="class in org.eclipse.emf.cdo.ui"><B>CDOItemProvider</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/ui/package-summary.html">org.eclipse.emf.cdo.ui</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/ui/CDOItemProvider.html#CDOItemProvider(org.eclipse.ui.IWorkbenchPage, org.eclipse.net4j.util.ui.views.IElementFilter)"><B>CDOItemProvider(IWorkbenchPage, IElementFilter)</B></A> -
+ enabled for the view.<DT><A HREF="./org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOInvalidationPolicy</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>A strategy interface to customize the invalidation behaviour of a <A HREF="./org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/ui/CDOItemProvider.html" title="class in org.eclipse.emf.cdo.ui"><B>CDOItemProvider</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/ui/package-summary.html">org.eclipse.emf.cdo.ui</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/ui/CDOItemProvider.html#CDOItemProvider(org.eclipse.ui.IWorkbenchPage, org.eclipse.net4j.util.ui.views.IElementFilter)"><B>CDOItemProvider(IWorkbenchPage, IElementFilter)</B></A> -
Constructor for class org.eclipse.emf.cdo.ui.<A HREF="./org/eclipse/emf/cdo/ui/CDOItemProvider.html" title="class in org.eclipse.emf.cdo.ui">CDOItemProvider</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/ui/CDOItemProvider.html#CDOItemProvider(org.eclipse.ui.IWorkbenchPage)"><B>CDOItemProvider(IWorkbenchPage)</B></A> -
@@ -1213,7 +1215,9 @@ Constructor for class org.eclipse.emf.cdo.spi.common.<A HREF="./org/eclipse/emf/
Constructor for class org.eclipse.emf.cdo.spi.common.<A HREF="./org/eclipse/emf/cdo/spi/common/CDOLobStoreImpl.html" title="class in org.eclipse.emf.cdo.spi.common">CDOLobStoreImpl</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/lob/CDOLobUtil.html" title="class in org.eclipse.emf.cdo.common.lob"><B>CDOLobUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/lob/package-summary.html">org.eclipse.emf.cdo.common.lob</A><DD>Some useful helpers for dealing with <A HREF="./org/eclipse/emf/cdo/common/lob/CDOLob.html" title="class in org.eclipse.emf.cdo.common.lob"><CODE>large objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/CDOLock.html" title="interface in org.eclipse.emf.cdo"><B>CDOLock</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>A read or write lock on an <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A> as returned by <A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoReadLock()"><CODE>CDOObject.cdoReadLock()</CODE></A> or
- <A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoWriteLock()"><CODE>CDOObject.cdoWriteLock()</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOMerger</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOMerger.ConflictException</B></A> - Exception in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#CDOMerger.ConflictException(java.lang.String, org.eclipse.emf.cdo.transaction.CDOMerger, org.eclipse.emf.cdo.common.commit.CDOChangeSetData)"><B>CDOMerger.ConflictException(String, CDOMerger, CDOChangeSetData)</B></A> -
+ <A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoWriteLock()"><CODE>CDOObject.cdoWriteLock()</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOMerger</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Calculates the changes between a source <A HREF="./org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="./org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A>
+ and returns the result relative to their common ancestor.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOMerger.ConflictException</B></A> - Exception in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Thrown from a <A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>merger</CODE></A> in case of conflicting changes in the a source and target
+ <A HREF="./org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change sets</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#CDOMerger.ConflictException(java.lang.String, org.eclipse.emf.cdo.transaction.CDOMerger, org.eclipse.emf.cdo.common.commit.CDOChangeSetData)"><B>CDOMerger.ConflictException(String, CDOMerger, CDOChangeSetData)</B></A> -
Constructor for exception org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html#CDOMerger.ConflictException(java.lang.String, java.lang.Throwable, org.eclipse.emf.cdo.transaction.CDOMerger, org.eclipse.emf.cdo.common.commit.CDOChangeSetData)"><B>CDOMerger.ConflictException(String, Throwable, CDOMerger, CDOChangeSetData)</B></A> -
@@ -1251,13 +1255,13 @@ Constructor for class org.eclipse.emf.cdo.net4j.<A HREF="./org/eclipse/emf/cdo/n
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/CDONotification.html" title="interface in org.eclipse.emf.cdo"><B>CDONotification</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>A base interface for all CDO specific notifications.<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><B>CDOObject</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>A specialized subinterface of <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> that is exposed by all CDO objects and allows access to special CDO
properties and features of those objects.<DT><A HREF="./org/eclipse/emf/cdo/view/CDOObjectHandler.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOObjectHandler</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>Call-back handler used by <A HREF="./org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>views</CODE></A> to tell implementors of this interface about <A HREF="./org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo"><CODE>state</CODE></A>
- changes of <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo"><B>CDOObjectImpl</B></A> - Class in <A HREF="./org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#CDOObjectImpl()"><B>CDOObjectImpl()</B></A> -
+ changes of <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo"><B>CDOObjectImpl</B></A> - Class in <A HREF="./org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A><DD>The base class of all <em>native</em> <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#CDOObjectImpl()"><B>CDOObjectImpl()</B></A> -
Constructor for class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreFeatureMap.html" title="class in org.eclipse.emf.internal.cdo"><B>CDOObjectImpl.CDOStoreFeatureMap</B></A> - Class in <A HREF="./org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A><DD>TODO Remove this when EMF has fixed bug 197487<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreFeatureMap.html#CDOObjectImpl.CDOStoreFeatureMap(org.eclipse.emf.ecore.EStructuralFeature)"><B>CDOObjectImpl.CDOStoreFeatureMap(EStructuralFeature)</B></A> -
Constructor for class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreFeatureMap.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl.CDOStoreFeatureMap</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html" title="class in org.eclipse.emf.internal.cdo"><B>CDOObjectImpl.CDOStoreSettingsImpl</B></A> - Class in <A HREF="./org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo"><B>CDOObjectReference</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>Represents a <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>CDOObject</CODE></A> typed reference from one object to another object.<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageInfo.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOPackageInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>Describes a single <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>package </CODE></A> instance of the nested package tree strucure represented by the
+<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html" title="class in org.eclipse.emf.internal.cdo"><B>CDOObjectImpl.CDOStoreSettingsImpl</B></A> - Class in <A HREF="./org/eclipse/emf/internal/cdo/package-summary.html">org.eclipse.emf.internal.cdo</A><DD>For internal use only.<DT><A HREF="./org/eclipse/emf/cdo/CDOObjectReference.html" title="interface in org.eclipse.emf.cdo"><B>CDOObjectReference</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>Represents a <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>CDOObject</CODE></A> typed reference from one object to another object.<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageInfo.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOPackageInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>Describes a single <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>package </CODE></A> instance of the nested package tree strucure represented by the
containing <A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageUnit.html" title="interface in org.eclipse.emf.cdo.common.model"><CODE>package unit</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOPackageRegistry</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>An EMF <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EPackage.Registry.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>package registry</CODE></A> that is used by CDO <A HREF="./org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repositories</CODE></A> and
<A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.html" title="interface in org.eclipse.emf.cdo.common"><CODE>sessions</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html" title="class in org.eclipse.emf.cdo.common.model"><B>CDOPackageRegistryPopulator</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>Populates a <A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html#getTarget()"><CODE>target</CODE></A> package registry by asynchronously polling a <A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html#getSource()"><CODE>source</CODE></A>
package registry for new <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EPackage.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EPackage</CODE></A> registrations.<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOPackageRegistryPopulator.html#CDOPackageRegistryPopulator(org.eclipse.emf.cdo.common.model.CDOPackageRegistry)"><B>CDOPackageRegistryPopulator(CDOPackageRegistry)</B></A> -
@@ -1277,7 +1281,8 @@ Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject
<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoPrefetch(int)"><B>cdoPrefetch(int)</B></A> -
Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDOProtocol.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDOProtocol</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>The communications protocol associated with a CDO <A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.html" title="interface in org.eclipse.emf.cdo.common"><CODE>session</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDOProtocolConstants</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>Symbolic protocol constants commonly used in CDO.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOPushTransaction</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#CDOPushTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)"><B>CDOPushTransaction(CDOTransaction)</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDOProtocol.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDOProtocol</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>The communications protocol associated with a CDO <A HREF="./org/eclipse/emf/cdo/common/CDOCommonSession.html" title="interface in org.eclipse.emf.cdo.common"><CODE>session</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.html" title="interface in org.eclipse.emf.cdo.common.protocol"><B>CDOProtocolConstants</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/protocol/package-summary.html">org.eclipse.emf.cdo.common.protocol</A><DD>Symbolic protocol constants commonly used in CDO.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction"><B>CDOPushTransaction</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="./org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#CDOPushTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)"><B>CDOPushTransaction(CDOTransaction)</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#CDOPushTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, java.io.File)"><B>CDOPushTransaction(CDOTransaction, File)</B></A> -
@@ -1286,7 +1291,9 @@ Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#CDOPushTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, java.io.File, boolean)"><B>CDOPushTransaction(CDOTransaction, File, boolean)</B></A> -
Constructor for class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOQuery</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>TODO Simon: JavaDoc<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryInfo.html" title="interface in org.eclipse.emf.cdo.common.util"><B>CDOQueryInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="class in org.eclipse.emf.cdo.common.util"><B>CDOQueryQueue</B></A>&lt;<A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="type parameter in CDOQueryQueue">E</A>&gt; - Class in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html#CDOQueryQueue()"><B>CDOQueryQueue()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view"><B>CDOQuery</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>Provides access to the information that specifies a query from a <A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="./org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A> and to the results of the remote query execution;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryInfo.html" title="interface in org.eclipse.emf.cdo.common.util"><B>CDOQueryInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>Encapsulates all the transferrable information that fully specifies a query from a <A HREF="./org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="./org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="class in org.eclipse.emf.cdo.common.util"><B>CDOQueryQueue</B></A>&lt;<A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="type parameter in CDOQueryQueue">E</A>&gt; - Class in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html#CDOQueryQueue()"><B>CDOQueryQueue()</B></A> -
Constructor for class org.eclipse.emf.cdo.common.util.<A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.html" title="class in org.eclipse.emf.cdo.common.util">CDOQueryQueue</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.BlockingCloseableIteratorImpl.html" title="class in org.eclipse.emf.cdo.common.util"><B>CDOQueryQueue.BlockingCloseableIteratorImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOQueryQueue.BlockingCloseableIteratorImpl.html#CDOQueryQueue.BlockingCloseableIteratorImpl()"><B>CDOQueryQueue.BlockingCloseableIteratorImpl()</B></A> -
@@ -1312,12 +1319,12 @@ Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal
been received.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.SubscriptionChanged.html" title="interface in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionEvent.SubscriptionChanged</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>A <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionEvent.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session
manager</CODE></A> when the <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSession.html#isSubscribed()"><CODE>subscription state</CODE></A> of a <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote
session</CODE></A> has changed.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html" title="interface in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionManager</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>Provides collaborative access to the <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html#getRemoteSessions()"><CODE>remote sessions</CODE></A> that are connected to the same
- repository as the <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html#getLocalSession()"><CODE>local session</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html" title="class in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionManager.EventAdapter</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html#CDORemoteSessionManager.EventAdapter()"><B>CDORemoteSessionManager.EventAdapter()</B></A> -
+ repository as the <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html#getLocalSession()"><CODE>local session</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html" title="class in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionManager.EventAdapter</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>A default adapter for all kinds of <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A> related events.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html#CDORemoteSessionManager.EventAdapter()"><B>CDORemoteSessionManager.EventAdapter()</B></A> -
Constructor for class org.eclipse.emf.cdo.session.remote.<A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html" title="class in org.eclipse.emf.cdo.session.remote">CDORemoteSessionManager.EventAdapter</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.LocalSubscriptionChangedEvent.html" title="interface in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionManager.LocalSubscriptionChangedEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><CODE>event</CODE></A> that is fired by a <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.LocalSubscriptionChangedEvent.html#getSource()"><CODE>remote session manager</CODE></A> after the
<A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html#isSubscribed()"><CODE>subscription mode</CODE></A> of the
- <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html#getLocalSession()"><CODE>local session</CODE></A> changed.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionMessage</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html#CDORemoteSessionMessage(java.lang.String, org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage.Priority, byte[])"><B>CDORemoteSessionMessage(String, CDORemoteSessionMessage.Priority, byte[])</B></A> -
+ <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html#getLocalSession()"><CODE>local session</CODE></A> changed.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionMessage</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>A message from a <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html#CDORemoteSessionMessage(java.lang.String, org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage.Priority, byte[])"><B>CDORemoteSessionMessage(String, CDORemoteSessionMessage.Priority, byte[])</B></A> -
Constructor for class org.eclipse.emf.cdo.session.remote.<A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote">CDORemoteSessionMessage</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html#CDORemoteSessionMessage(java.lang.String, org.eclipse.emf.cdo.session.remote.CDORemoteSessionMessage.Priority)"><B>CDORemoteSessionMessage(String, CDORemoteSessionMessage.Priority)</B></A> -
@@ -1332,14 +1339,14 @@ Constructor for class org.eclipse.emf.cdo.session.remote.<A HREF="./org/eclipse/
<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html#CDORemoteSessionMessage(org.eclipse.net4j.util.io.ExtendedDataInput)"><B>CDORemoteSessionMessage(ExtendedDataInput)</B></A> -
Constructor for class org.eclipse.emf.cdo.session.remote.<A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote">CDORemoteSessionMessage</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html" title="enum in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionMessage.Priority</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDORemoveFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOReplicationContext.html" title="interface in org.eclipse.emf.cdo.spi.common"><B>CDOReplicationContext</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/spi/common/package-summary.html">org.eclipse.emf.cdo.spi.common</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOReplicationInfo.html" title="interface in org.eclipse.emf.cdo.spi.common"><B>CDOReplicationInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/spi/common/package-summary.html">org.eclipse.emf.cdo.spi.common</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/CDORepositoryInfo.html" title="interface in org.eclipse.emf.cdo.session"><B>CDORepositoryInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>Describes a model repository a <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> is connected to.<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoResource()"><B>cdoResource()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html" title="enum in org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionMessage.Priority</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/session/remote/package-summary.html">org.eclipse.emf.cdo.session.remote</A><DD>Enumerates the possible <A HREF="./org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><CODE>remote session message</CODE></A> priorities.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDORemoveFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDORemoveFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOReplicationContext.html" title="interface in org.eclipse.emf.cdo.spi.common"><B>CDOReplicationContext</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/spi/common/package-summary.html">org.eclipse.emf.cdo.spi.common</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/CDOReplicationInfo.html" title="interface in org.eclipse.emf.cdo.spi.common"><B>CDOReplicationInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/spi/common/package-summary.html">org.eclipse.emf.cdo.spi.common</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/CDORepositoryInfo.html" title="interface in org.eclipse.emf.cdo.session"><B>CDORepositoryInfo</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>Describes a model repository a <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> is connected to.<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoResource()"><B>cdoResource()</B></A> -
Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A>
<DD>Returns the <A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> of this object, no matter where this object is located in the containment
tree of that resource, or <code>null</code> if this object is not contained in a CDO resource.
<DT><A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><B>CDOResource</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>A representation of the model object '<em><b>CDO Resource</b></em>'.<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoResource()"><B>cdoResource()</B></A> -
Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/eresource/CDOResourceFactory.html" title="interface in org.eclipse.emf.cdo.eresource"><B>CDOResourceFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl"><B>CDOResourceFactoryImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html#CDOResourceFactoryImpl()"><B>CDOResourceFactoryImpl()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/eresource/CDOResourceFactory.html" title="interface in org.eclipse.emf.cdo.eresource"><B>CDOResourceFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>Creates <A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl"><B>CDOResourceFactoryImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A><DD>Creates default <A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html#CDOResourceFactoryImpl()"><B>CDOResourceFactoryImpl()</B></A> -
Constructor for class org.eclipse.emf.cdo.eresource.impl.<A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">CDOResourceFactoryImpl</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/eresource/CDOResourceFolder.html" title="interface in org.eclipse.emf.cdo.eresource"><B>CDOResourceFolder</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>A representation of the model object '<em><b>CDO Resource Folder</b></em>'.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl"><B>CDOResourceFolderImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A><DD>An implementation of the model object '<em><b>CDO Resource Folder</b></em>'.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html#CDOResourceFolderImpl()"><B>CDOResourceFolderImpl()</B></A> -
@@ -1372,7 +1379,8 @@ Constructor for class org.eclipse.emf.cdo.eresource.impl.<A HREF="./org/eclipse/
<DT><A HREF="./org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.html" title="class in org.eclipse.emf.cdo.eresource.provider"><B>CDOResourceNodeItemProvider</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/provider/package-summary.html">org.eclipse.emf.cdo.eresource.provider</A><DD>This is the item provider adapter for a <A HREF="./org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResourceNode</CODE></A> object. <!<DT><A HREF="./org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.html#CDOResourceNodeItemProvider(org.eclipse.emf.common.notify.AdapterFactory)"><B>CDOResourceNodeItemProvider(AdapterFactory)</B></A> -
Constructor for class org.eclipse.emf.cdo.eresource.provider.<A HREF="./org/eclipse/emf/cdo/eresource/provider/CDOResourceNodeItemProvider.html" title="class in org.eclipse.emf.cdo.eresource.provider">CDOResourceNodeItemProvider</A>
<DD>This constructs an instance from a factory and a notifier. <!
-<DT><A HREF="./org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.html" title="interface in org.eclipse.emf.cdo.eresource.validation"><B>CDOResourceNodeValidator</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/validation/package-summary.html">org.eclipse.emf.cdo.eresource.validation</A><DD>A sample validator interface for <A HREF="./org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResourceNode</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.html" title="interface in org.eclipse.emf.cdo.eresource.validation"><B>CDOResourceValidator</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/validation/package-summary.html">org.eclipse.emf.cdo.eresource.validation</A><DD>A sample validator interface for <A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session"><B>CDORetryExceptionHandler</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html#CDORetryExceptionHandler(int)"><B>CDORetryExceptionHandler(int)</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/eresource/validation/CDOResourceNodeValidator.html" title="interface in org.eclipse.emf.cdo.eresource.validation"><B>CDOResourceNodeValidator</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/validation/package-summary.html">org.eclipse.emf.cdo.eresource.validation</A><DD>A sample validator interface for <A HREF="./org/eclipse/emf/cdo/eresource/CDOResourceNode.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResourceNode</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/eresource/validation/CDOResourceValidator.html" title="interface in org.eclipse.emf.cdo.eresource.validation"><B>CDOResourceValidator</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/validation/package-summary.html">org.eclipse.emf.cdo.eresource.validation</A><DD>A sample validator interface for <A HREF="./org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session"><B>CDORetryExceptionHandler</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>A <A HREF="./org/eclipse/emf/cdo/session/CDOSession.ExceptionHandler.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session exection handler</CODE></A> that retries the failed protocol operation a configurable number
+ of times.<DT><A HREF="./org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html#CDORetryExceptionHandler(int)"><B>CDORetryExceptionHandler(int)</B></A> -
Constructor for class org.eclipse.emf.cdo.session.<A HREF="./org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session">CDORetryExceptionHandler</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html#CDORetryExceptionHandler()"><B>CDORetryExceptionHandler()</B></A> -
@@ -1398,7 +1406,7 @@ Constructor for class org.eclipse.emf.cdo.spi.common.commit.<A HREF="./org/eclip
and caching them.<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDORevisionMerger.html" title="class in org.eclipse.emf.cdo.spi.common.revision"><B>CDORevisionMerger</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/spi/common/revision/package-summary.html">org.eclipse.emf.cdo.spi.common.revision</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDORevisionMerger.html#CDORevisionMerger()"><B>CDORevisionMerger()</B></A> -
Constructor for class org.eclipse.emf.cdo.spi.common.revision.<A HREF="./org/eclipse/emf/cdo/spi/common/revision/CDORevisionMerger.html" title="class in org.eclipse.emf.cdo.spi.common.revision">CDORevisionMerger</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html" title="interface in org.eclipse.emf.cdo.view"><B>CDORevisionPrefetchingPolicy</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision"><B>CDORevisionProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>Provides consumers with the <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A> of <A HREF="./org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id"><CODE>identifiable</CODE></A> CDO objects by selecting a
+<DT><A HREF="./org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html" title="interface in org.eclipse.emf.cdo.view"><B>CDORevisionPrefetchingPolicy</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/view/package-summary.html">org.eclipse.emf.cdo.view</A><DD>A strategy interface to customize the <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revision</CODE></A> prefetching behaviour of a <A HREF="./org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionProvider.html" title="interface in org.eclipse.emf.cdo.common.revision"><B>CDORevisionProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>Provides consumers with the <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A> of <A HREF="./org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id"><CODE>identifiable</CODE></A> CDO objects by selecting a
particular one from several possible <A HREF="./org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="interface in org.eclipse.emf.cdo.common.branch"><CODE>branch points</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.html" title="class in org.eclipse.emf.cdo.common.revision"><B>CDORevisionUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>Various static helper methods for dealing with <A HREF="./org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.AllRevisionsDumper.html" title="class in org.eclipse.emf.cdo.common.revision"><B>CDORevisionUtil.AllRevisionsDumper</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.AllRevisionsDumper.html#CDORevisionUtil.AllRevisionsDumper(java.util.Map)"><B>CDORevisionUtil.AllRevisionsDumper(Map&lt;CDOBranch, List&lt;CDORevision&gt;&gt;)</B></A> -
Constructor for class org.eclipse.emf.cdo.common.revision.<A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.AllRevisionsDumper.html" title="class in org.eclipse.emf.cdo.common.revision">CDORevisionUtil.AllRevisionsDumper</A>
<DD>&nbsp;
@@ -1414,7 +1422,8 @@ Constructor for class org.eclipse.emf.cdo.common.revision.<A HREF="./org/eclipse
<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.CDORevisionComparator.html" title="class in org.eclipse.emf.cdo.common.revision"><B>CDORevisionUtil.CDORevisionComparator</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/common/revision/package-summary.html">org.eclipse.emf.cdo.common.revision</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.CDORevisionComparator.html#CDORevisionUtil.CDORevisionComparator()"><B>CDORevisionUtil.CDORevisionComparator()</B></A> -
Constructor for class org.eclipse.emf.cdo.common.revision.<A HREF="./org/eclipse/emf/cdo/common/revision/CDORevisionUtil.CDORevisionComparator.html" title="class in org.eclipse.emf.cdo.common.revision">CDORevisionUtil.CDORevisionComparator</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOSavepoint</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.html" title="class in org.eclipse.emf.cdo.server"><B>CDOServerBrowser</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.html#CDOServerBrowser(java.util.Map)"><B>CDOServerBrowser(Map&lt;String, InternalRepository&gt;)</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOSavepoint</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>One in a sequence of possibly several points in time of a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="./org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.<DT><A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.html" title="class in org.eclipse.emf.cdo.server"><B>CDOServerBrowser</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.html#CDOServerBrowser(java.util.Map)"><B>CDOServerBrowser(Map&lt;String, InternalRepository&gt;)</B></A> -
Constructor for class org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.html" title="class in org.eclipse.emf.cdo.server">CDOServerBrowser</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.AbstractPage.html" title="class in org.eclipse.emf.cdo.server"><B>CDOServerBrowser.AbstractPage</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/server/package-summary.html">org.eclipse.emf.cdo.server</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/server/CDOServerBrowser.AbstractPage.html#CDOServerBrowser.AbstractPage(java.lang.String, java.lang.String)"><B>CDOServerBrowser.AbstractPage(String, String)</B></A> -
@@ -1473,7 +1482,7 @@ Constructor for class org.eclipse.emf.cdo.server.<A HREF="./org/eclipse/emf/cdo/
<A HREF="./org/eclipse/emf/cdo/session/CDOSession.Options.html#setGeneratedPackageEmulationEnabled(boolean)"><CODE>generated package emulation enabled</CODE></A> option of a
<A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> has changed.<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSession.Options.LobCacheEvent.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSession.Options.LobCacheEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired when the <A HREF="./org/eclipse/emf/cdo/session/CDOSession.Options.html#setLobCache(org.eclipse.emf.cdo.common.lob.CDOLobStore)"><CODE>large object cache</CODE></A>
option of a <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> has changed.<DT><A HREF="./org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.net4j"><B>CDOSessionConfiguration</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/net4j/package-summary.html">org.eclipse.emf.cdo.net4j</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/server/embedded/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.server.embedded"><B>CDOSessionConfiguration</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/server/embedded/package-summary.html">org.eclipse.emf.cdo.server.embedded</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionConfiguration</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>Configures and opens new <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>sessions</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionConfiguration.SessionOpenedEvent.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionConfiguration.SessionOpenedEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>Fired from a <A HREF="./org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> after a new <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> has been
- opened.<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionConfigurationFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>A generic <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><CODE>event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.html" title="class in org.eclipse.emf.spi.cdo"><B>CDOSessionInvalidationAggregator</B></A> - Class in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.html#CDOSessionInvalidationAggregator(org.eclipse.emf.cdo.session.CDOSession)"><B>CDOSessionInvalidationAggregator(CDOSession)</B></A> -
+ opened.<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionConfigurationFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>Creates <A HREF="./org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>A generic <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/event/IEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.event"><CODE>event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.html" title="class in org.eclipse.emf.spi.cdo"><B>CDOSessionInvalidationAggregator</B></A> - Class in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.html#CDOSessionInvalidationAggregator(org.eclipse.emf.cdo.session.CDOSession)"><B>CDOSessionInvalidationAggregator(CDOSession)</B></A> -
Constructor for class org.eclipse.emf.spi.cdo.<A HREF="./org/eclipse/emf/spi/cdo/CDOSessionInvalidationAggregator.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionInvalidationAggregator</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionInvalidationEvent.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionInvalidationEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>A <A HREF="./org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session event</CODE></A> fired when passive updates (commit notifications) are being received from a
@@ -1498,7 +1507,7 @@ Constructor for class org.eclipse.emf.spi.cdo.<A HREF="./org/eclipse/emf/spi/cdo
<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOSessionProtocol.RepositoryTimeResult.html" title="class in org.eclipse.emf.spi.cdo"><B>CDOSessionProtocol.RepositoryTimeResult</B></A> - Class in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOSessionProtocol.RepositoryTimeResult.html#CDOSessionProtocol.RepositoryTimeResult()"><B>CDOSessionProtocol.RepositoryTimeResult()</B></A> -
Constructor for class org.eclipse.emf.spi.cdo.<A HREF="./org/eclipse/emf/spi/cdo/CDOSessionProtocol.RepositoryTimeResult.html" title="class in org.eclipse.emf.spi.cdo">CDOSessionProtocol.RepositoryTimeResult</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionProvider.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.html" title="interface in org.eclipse.emf.cdo.net4j"><B>CDOSessionRecoveryEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/net4j/package-summary.html">org.eclipse.emf.cdo.net4j</A><DD>A <A HREF="./org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session event</CODE></A> fired from <A HREF="./org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.net4j"><CODE>recovering session</CODE></A> when
+<DT><A HREF="./org/eclipse/emf/cdo/session/CDOSessionProvider.html" title="interface in org.eclipse.emf.cdo.session"><B>CDOSessionProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/session/package-summary.html">org.eclipse.emf.cdo.session</A><DD>Provides consumers with <A HREF="./org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> instances.<DT><A HREF="./org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.html" title="interface in org.eclipse.emf.cdo.net4j"><B>CDOSessionRecoveryEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/net4j/package-summary.html">org.eclipse.emf.cdo.net4j</A><DD>A <A HREF="./org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session event</CODE></A> fired from <A HREF="./org/eclipse/emf/cdo/net4j/RecoveringCDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.net4j"><CODE>recovering session</CODE></A> when
recovery has started or finished.<DT><A HREF="./org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.Type.html" title="enum in org.eclipse.emf.cdo.net4j"><B>CDOSessionRecoveryEvent.Type</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/net4j/package-summary.html">org.eclipse.emf.cdo.net4j</A><DD>Enumerates the possible types of <A HREF="./org/eclipse/emf/cdo/net4j/CDOSessionRecoveryEvent.html" title="interface in org.eclipse.emf.cdo.net4j"><CODE>session recovery events</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOSetFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOSetFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoSettings()"><B>cdoSettings()</B></A> -
Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
@@ -1508,14 +1517,16 @@ Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject
<DT><A HREF="./org/eclipse/emf/cdo/CDOState.html" title="enum in org.eclipse.emf.cdo"><B>CDOState</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/package-summary.html">org.eclipse.emf.cdo</A><DD>Enumerates the possible states of <b>local</b> <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoState()"><B>cdoState()</B></A> -
Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOStore.html" title="interface in org.eclipse.emf.spi.cdo"><B>CDOStore</B></A> - Interface in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>CDORevision needs to follow these rules:<br>
- - Keep CDOID only when the object (!<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util"><B>CDOTimeProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A read-write view to the <em>current</em> (i.e. latest) state of the object graph in the repository.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction.Options</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Encapsulates a set of notifying <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> configuration options.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.AutoReleaseLocksEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction.Options.AutoReleaseLocksEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from transaction <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#options()"><CODE>options</CODE></A> when the
+<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOStore.html" title="interface in org.eclipse.emf.spi.cdo"><B>CDOStore</B></A> - Interface in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>A CDO specific version of an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/InternalEObject.EStore.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>InternalEObject.EStore</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util"><B>CDOTimeProvider</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/util/package-summary.html">org.eclipse.emf.cdo.common.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A read-write view to the <em>current</em> (i.e. latest) state of the object graph in the repository.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction.Options</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Encapsulates a set of notifying <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> configuration options.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.AutoReleaseLocksEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction.Options.AutoReleaseLocksEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from transaction <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#options()"><CODE>options</CODE></A> when the
<A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html#setAutoReleaseLocksEnabled(boolean)"><CODE>auto release locks</CODE></A> option has changed.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.ConflictResolversEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransaction.Options.ConflictResolversEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>An <A HREF="../../org.eclipse.net4j.util.doc/javadoc/org/eclipse/net4j/util/options/IOptionsEvent.html?is-external=true" title="class or interface in org.eclipse.net4j.util.options"><CODE>options event</CODE></A> fired from transaction <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#options()"><CODE>options</CODE></A> when the
<A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.Options.html#addConflictResolver(org.eclipse.emf.cdo.transaction.CDOConflictResolver)"><CODE>conflict resolvers</CODE></A> option has changed.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionConflictEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> for each
<A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionConflictEvent.html#getConflictingObject()"><CODE>object</CODE></A> that enters the <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#hasConflict()"><CODE>conflict</CODE></A> state.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionFinishedEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> when it becomes
<A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#isDirty()"><CODE>clean</CODE></A> after a sucessful <A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html#commit()"><CODE>commit</CODE></A> or
- <A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html#rollback()"><CODE>rollback</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.Type.html" title="enum in org.eclipse.emf.cdo.transaction"><B>CDOTransactionFinishedEvent.Type</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Enumerates the possible <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.html#getType()"><CODE>causes</CODE></A> for a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> to become finished.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler1</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler2</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandlerBase</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionStartedEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> when it first becomes
- <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#isDirty()"><CODE>dirty</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html" title="interface in org.eclipse.emf.spi.cdo"><B>CDOTransactionStrategy</B></A> - Interface in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>TODO Simon: JavaDoc<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOType.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOType</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOUnsetFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/util/CDOUpdatable.html" title="interface in org.eclipse.emf.cdo.util"><B>CDOUpdatable</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html" title="class in org.eclipse.emf.cdo.util"><B>CDOURIData</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html#CDOURIData()"><B>CDOURIData()</B></A> -
+ <A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html#rollback()"><CODE>rollback</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.Type.html" title="enum in org.eclipse.emf.cdo.transaction"><B>CDOTransactionFinishedEvent.Type</B></A> - Enum in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Enumerates the possible <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionFinishedEvent.html#getType()"><CODE>causes</CODE></A> for a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> to become finished.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A combination of <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler1</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A call-back interface that is called by a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when <A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A> are
+ attached, modified or detached.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler2</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A call-back interface that is called by a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when it is about to be committed, has
+ been committed or rolled back.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandlerBase</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A marker interface for use with <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#addTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.addTransactionHandler()</CODE></A> and
+ <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#removeTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.removeTransactionHandler()</CODE></A>.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOTransactionStartedEvent</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A <A HREF="./org/eclipse/emf/cdo/view/CDOViewEvent.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view event</CODE></A> fired from a <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> when it first becomes
+ <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html#isDirty()"><CODE>dirty</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html" title="interface in org.eclipse.emf.spi.cdo"><B>CDOTransactionStrategy</B></A> - Interface in <A HREF="./org/eclipse/emf/spi/cdo/package-summary.html">org.eclipse.emf.spi.cdo</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOType.html" title="interface in org.eclipse.emf.cdo.common.model"><B>CDOType</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/model/package-summary.html">org.eclipse.emf.cdo.common.model</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/common/revision/delta/CDOUnsetFeatureDelta.html" title="interface in org.eclipse.emf.cdo.common.revision.delta"><B>CDOUnsetFeatureDelta</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/common/revision/delta/package-summary.html">org.eclipse.emf.cdo.common.revision.delta</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/util/CDOUpdatable.html" title="interface in org.eclipse.emf.cdo.util"><B>CDOUpdatable</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html" title="class in org.eclipse.emf.cdo.util"><B>CDOURIData</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html#CDOURIData()"><B>CDOURIData()</B></A> -
Constructor for class org.eclipse.emf.cdo.util.<A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html" title="class in org.eclipse.emf.cdo.util">CDOURIData</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html#CDOURIData(java.lang.String)"><B>CDOURIData(String)</B></A> -
@@ -1524,7 +1535,7 @@ Constructor for class org.eclipse.emf.cdo.util.<A HREF="./org/eclipse/emf/cdo/ut
<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html#CDOURIData(org.eclipse.emf.common.util.URI)"><B>CDOURIData(URI)</B></A> -
Constructor for class org.eclipse.emf.cdo.util.<A HREF="./org/eclipse/emf/cdo/util/CDOURIData.html" title="class in org.eclipse.emf.cdo.util">CDOURIData</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIUtil.html" title="class in org.eclipse.emf.cdo.util"><B>CDOURIUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOUserSavepoint</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Creates a save point in a <A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOUserTransaction</CODE></A> that can be used to roll back a part of the transaction.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOUserTransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Only deal with transaction process.<DT><A HREF="./org/eclipse/emf/cdo/util/CDOUtil.html" title="class in org.eclipse.emf.cdo.util"><B>CDOUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoView()"><B>cdoView()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/util/CDOURIUtil.html" title="class in org.eclipse.emf.cdo.util"><B>CDOURIUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOUserSavepoint</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Creates a save point in a <A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOUserTransaction</CODE></A> that can be used to roll back a part of the transaction.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOUserTransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Provides functionality that is common to both <A HREF="./org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>single</CODE></A> transactions and <A HREF="./org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>distributed</CODE></A> (XA) transactions.<DT><A HREF="./org/eclipse/emf/cdo/util/CDOUtil.html" title="class in org.eclipse.emf.cdo.util"><B>CDOUtil</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/util/package-summary.html">org.eclipse.emf.cdo.util</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/CDOObject.html#cdoView()"><B>cdoView()</B></A> -
Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo">CDOObject</A>
<DD>Returns the <A HREF="./org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> this object is associated with, or <code>null</code> if this object is not
associated with a view.
@@ -1551,7 +1562,8 @@ Method in interface org.eclipse.emf.cdo.<A HREF="./org/eclipse/emf/cdo/CDOObject
<DT><A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html#cdoWriteLock()"><B>cdoWriteLock()</B></A> -
Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A>
<DD>&nbsp;
-<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOXASavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOXASavepoint</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOXATransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>&nbsp;<DT><A HREF="./org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSource(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)"><B>changedInSource(CDORevisionDelta)</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOXASavepoint.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOXASavepoint</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>Creates a save point in a <A HREF="./org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOXATransaction</CODE></A> that can be used to roll back a part of the transaction.<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><B>CDOXATransaction</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/transaction/package-summary.html">org.eclipse.emf.cdo.transaction</A><DD>A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="./org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.<DT><A HREF="./org/eclipse/emf/spi/cdo/DefaultCDOMerger.html#changedInSource(org.eclipse.emf.cdo.common.revision.delta.CDORevisionDelta)"><B>changedInSource(CDORevisionDelta)</B></A> -
Method in class org.eclipse.emf.spi.cdo.<A HREF="./org/eclipse/emf/spi/cdo/DefaultCDOMerger.html" title="class in org.eclipse.emf.spi.cdo">DefaultCDOMerger</A>
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/spi/cdo/DefaultCDOMerger.PerFeature.html#changedInSource(org.eclipse.emf.cdo.common.revision.delta.CDOFeatureDelta)"><B>changedInSource(CDOFeatureDelta)</B></A> -
@@ -1810,7 +1822,7 @@ Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/t
<DD>Synchronously executes the delegate handler's <A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html#committedTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)"><CODE>committedTransaction()</CODE></A> method.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#committedTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)"><B>committedTransaction(CDOTransaction, CDOCommitContext)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A>
-<DD>&nbsp;
+<DD>This implementation does nothing.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html#committedTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)"><B>committedTransaction(CDOTransaction, CDOCommitContext)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A>
<DD>&nbsp;
@@ -1822,7 +1834,7 @@ Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/t
<DD>Asynchronously executes the delegate handler's <A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html#committingTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)"><CODE>committingTransaction()</CODE></A> method.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#committingTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)"><B>committingTransaction(CDOTransaction, CDOCommitContext)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A>
-<DD>&nbsp;
+<DD>This implementation does nothing.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html#committingTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)"><B>committingTransaction(CDOTransaction, CDOCommitContext)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A>
<DD>&nbsp;
@@ -3295,13 +3307,13 @@ Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal
<DT><A HREF="./org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.html" title="class in org.eclipse.emf.cdo.eresource.util"><B>EresourceAdapterFactory</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/util/package-summary.html">org.eclipse.emf.cdo.eresource.util</A><DD>The <b>Adapter Factory</b> for the model.<DT><A HREF="./org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.html#EresourceAdapterFactory()"><B>EresourceAdapterFactory()</B></A> -
Constructor for class org.eclipse.emf.cdo.eresource.util.<A HREF="./org/eclipse/emf/cdo/eresource/util/EresourceAdapterFactory.html" title="class in org.eclipse.emf.cdo.eresource.util">EresourceAdapterFactory</A>
<DD>Creates an instance of the adapter factory. <!
-<DT><A HREF="./org/eclipse/emf/cdo/eresource/EresourceFactory.html" title="interface in org.eclipse.emf.cdo.eresource"><B>EresourceFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>The <b>Factory</b> for the model.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl"><B>EresourceFactoryImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A><DD>An implementation of the model <b>Factory</b>.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html#EresourceFactoryImpl()"><B>EresourceFactoryImpl()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/eresource/EresourceFactory.html" title="interface in org.eclipse.emf.cdo.eresource"><B>EresourceFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>The <b>Factory</b> for the Eresource model.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl"><B>EresourceFactoryImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/impl/package-summary.html">org.eclipse.emf.cdo.eresource.impl</A><DD>An implementation of the model <b>Factory</b>.<DT><A HREF="./org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html#EresourceFactoryImpl()"><B>EresourceFactoryImpl()</B></A> -
Constructor for class org.eclipse.emf.cdo.eresource.impl.<A HREF="./org/eclipse/emf/cdo/eresource/impl/EresourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">EresourceFactoryImpl</A>
<DD>Creates an instance of the factory. <!
<DT><A HREF="./org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.html" title="class in org.eclipse.emf.cdo.eresource.provider"><B>EresourceItemProviderAdapterFactory</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/eresource/provider/package-summary.html">org.eclipse.emf.cdo.eresource.provider</A><DD>This is the factory that is used to provide the interfaces needed to support Viewers.<DT><A HREF="./org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.html#EresourceItemProviderAdapterFactory()"><B>EresourceItemProviderAdapterFactory()</B></A> -
Constructor for class org.eclipse.emf.cdo.eresource.provider.<A HREF="./org/eclipse/emf/cdo/eresource/provider/EresourceItemProviderAdapterFactory.html" title="class in org.eclipse.emf.cdo.eresource.provider">EresourceItemProviderAdapterFactory</A>
<DD>This constructs an instance. <!
-<DT><A HREF="./org/eclipse/emf/cdo/eresource/EresourcePackage.html" title="interface in org.eclipse.emf.cdo.eresource"><B>EresourcePackage</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>The <b>Package</b> for the model.<DT><A HREF="./org/eclipse/emf/cdo/eresource/EresourcePackage.Literals.html" title="interface in org.eclipse.emf.cdo.eresource"><B>EresourcePackage.Literals</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>Defines literals for the meta objects that represent
+<DT><A HREF="./org/eclipse/emf/cdo/eresource/EresourcePackage.html" title="interface in org.eclipse.emf.cdo.eresource"><B>EresourcePackage</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>The <b>Package</b> for the Eresource model.<DT><A HREF="./org/eclipse/emf/cdo/eresource/EresourcePackage.Literals.html" title="interface in org.eclipse.emf.cdo.eresource"><B>EresourcePackage.Literals</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/eresource/package-summary.html">org.eclipse.emf.cdo.eresource</A><DD>Defines literals for the meta objects that represent
each class,
each feature of each class,
@@ -3348,13 +3360,13 @@ Method in class org.eclipse.emf.internal.cdo.<A HREF="./org/eclipse/emf/internal
<DT><A HREF="./org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.html" title="class in org.eclipse.emf.cdo.etypes.util"><B>EtypesAdapterFactory</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/etypes/util/package-summary.html">org.eclipse.emf.cdo.etypes.util</A><DD>The <b>Adapter Factory</b> for the model.<DT><A HREF="./org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.html#EtypesAdapterFactory()"><B>EtypesAdapterFactory()</B></A> -
Constructor for class org.eclipse.emf.cdo.etypes.util.<A HREF="./org/eclipse/emf/cdo/etypes/util/EtypesAdapterFactory.html" title="class in org.eclipse.emf.cdo.etypes.util">EtypesAdapterFactory</A>
<DD>Creates an instance of the adapter factory. <!
-<DT><A HREF="./org/eclipse/emf/cdo/etypes/EtypesFactory.html" title="interface in org.eclipse.emf.cdo.etypes"><B>EtypesFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A><DD>The <b>Factory</b> for the model.<DT><A HREF="./org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl"><B>EtypesFactoryImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/etypes/impl/package-summary.html">org.eclipse.emf.cdo.etypes.impl</A><DD>An implementation of the model <b>Factory</b>.<DT><A HREF="./org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html#EtypesFactoryImpl()"><B>EtypesFactoryImpl()</B></A> -
+<DT><A HREF="./org/eclipse/emf/cdo/etypes/EtypesFactory.html" title="interface in org.eclipse.emf.cdo.etypes"><B>EtypesFactory</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A><DD>The <b>Factory</b> for the Etypes model.<DT><A HREF="./org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl"><B>EtypesFactoryImpl</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/etypes/impl/package-summary.html">org.eclipse.emf.cdo.etypes.impl</A><DD>An implementation of the model <b>Factory</b>.<DT><A HREF="./org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html#EtypesFactoryImpl()"><B>EtypesFactoryImpl()</B></A> -
Constructor for class org.eclipse.emf.cdo.etypes.impl.<A HREF="./org/eclipse/emf/cdo/etypes/impl/EtypesFactoryImpl.html" title="class in org.eclipse.emf.cdo.etypes.impl">EtypesFactoryImpl</A>
<DD>Creates an instance of the factory. <!
<DT><A HREF="./org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.html" title="class in org.eclipse.emf.cdo.etypes.provider"><B>EtypesItemProviderAdapterFactory</B></A> - Class in <A HREF="./org/eclipse/emf/cdo/etypes/provider/package-summary.html">org.eclipse.emf.cdo.etypes.provider</A><DD>This is the factory that is used to provide the interfaces needed to support Viewers.<DT><A HREF="./org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.html#EtypesItemProviderAdapterFactory()"><B>EtypesItemProviderAdapterFactory()</B></A> -
Constructor for class org.eclipse.emf.cdo.etypes.provider.<A HREF="./org/eclipse/emf/cdo/etypes/provider/EtypesItemProviderAdapterFactory.html" title="class in org.eclipse.emf.cdo.etypes.provider">EtypesItemProviderAdapterFactory</A>
<DD>This constructs an instance. <!
-<DT><A HREF="./org/eclipse/emf/cdo/etypes/EtypesPackage.html" title="interface in org.eclipse.emf.cdo.etypes"><B>EtypesPackage</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A><DD>The <b>Package</b> for the model.<DT><A HREF="./org/eclipse/emf/cdo/etypes/EtypesPackage.Literals.html" title="interface in org.eclipse.emf.cdo.etypes"><B>EtypesPackage.Literals</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A><DD>Defines literals for the meta objects that represent
+<DT><A HREF="./org/eclipse/emf/cdo/etypes/EtypesPackage.html" title="interface in org.eclipse.emf.cdo.etypes"><B>EtypesPackage</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A><DD>The <b>Package</b> for the Etypes model.<DT><A HREF="./org/eclipse/emf/cdo/etypes/EtypesPackage.Literals.html" title="interface in org.eclipse.emf.cdo.etypes"><B>EtypesPackage.Literals</B></A> - Interface in <A HREF="./org/eclipse/emf/cdo/etypes/package-summary.html">org.eclipse.emf.cdo.etypes</A><DD>Defines literals for the meta objects that represent
each class,
each feature of each class,
@@ -4319,7 +4331,7 @@ Method in interface org.eclipse.emf.cdo.session.<A HREF="./org/eclipse/emf/cdo/s
a list gets populated.
<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getCollectionLoadingPolicy()"><B>getCollectionLoadingPolicy()</B></A> -
Method in interface org.eclipse.emf.cdo.view.<A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html" title="interface in org.eclipse.emf.cdo.view">CDOFetchRuleManager</A>
-<DD>TODO Simon: JavaDoc
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html#getComment()"><B>getComment()</B></A> -
Method in interface org.eclipse.emf.cdo.common.commit.<A HREF="./org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOCommitInfo</A>
<DD>&nbsp;
@@ -4538,7 +4550,7 @@ Method in class org.eclipse.emf.cdo.spi.server.<A HREF="./org/eclipse/emf/cdo/sp
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getContext()"><B>getContext()</B></A> -
Method in interface org.eclipse.emf.cdo.view.<A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html" title="interface in org.eclipse.emf.cdo.view">CDOFetchRuleManager</A>
-<DD>TODO Simon: JavaDoc
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/common/model/CDOModelUtil.html#getCoreType(org.eclipse.emf.ecore.EClassifier)"><B>getCoreType(EClassifier)</B></A> -
Static method in class org.eclipse.emf.cdo.common.model.<A HREF="./org/eclipse/emf/cdo/common/model/CDOModelUtil.html" title="class in org.eclipse.emf.cdo.common.model">CDOModelUtil</A>
<DD>Core types includes also complex data like EAnnotation, and EEnum
@@ -5011,7 +5023,7 @@ Method in interface org.eclipse.emf.cdo.session.<A HREF="./org/eclipse/emf/cdo/s
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getFetchRules(java.util.Collection)"><B>getFetchRules(Collection&lt;CDOID&gt;)</B></A> -
Method in interface org.eclipse.emf.cdo.view.<A HREF="./org/eclipse/emf/cdo/view/CDOFetchRuleManager.html" title="interface in org.eclipse.emf.cdo.view">CDOFetchRuleManager</A>
-<DD>TODO Simon: JavaDoc
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html#getField()"><B>getField()</B></A> -
Method in class org.eclipse.emf.cdo.server.db.mapping.<A HREF="./org/eclipse/emf/cdo/server/db/mapping/AbstractTypeMapping.html" title="class in org.eclipse.emf.cdo.server.db.mapping">AbstractTypeMapping</A>
<DD>&nbsp;
@@ -9175,7 +9187,8 @@ Method in class org.eclipse.emf.cdo.spi.common.revision.<A HREF="./org/eclipse/e
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.html#merge(org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)"><B>merge(CDOChangeSet, CDOChangeSet)</B></A> -
Method in interface org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</A>
-<DD>&nbsp;
+<DD>Calculates the changes between a source <A HREF="./org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="./org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html#merge(org.eclipse.emf.cdo.common.branch.CDOBranchPoint, org.eclipse.emf.cdo.transaction.CDOMerger)"><B>merge(CDOBranchPoint, CDOMerger)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A>
<DD>&nbsp;
@@ -9361,7 +9374,7 @@ Static variable in interface org.eclipse.emf.cdo.common.revision.<A HREF="./org/
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html#NOOP"><B>NOOP</B></A> -
Static variable in interface org.eclipse.emf.cdo.view.<A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view">CDOFeatureAnalyzer</A>
-<DD>TODO Simon: JavaDoc
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.html#notifyChanged(org.eclipse.emf.common.notify.Notification)"><B>notifyChanged(Notification)</B></A> -
Method in class org.eclipse.emf.cdo.eresource.provider.<A HREF="./org/eclipse/emf/cdo/eresource/provider/CDOResourceFolderItemProvider.html" title="class in org.eclipse.emf.cdo.eresource.provider">CDOResourceFolderItemProvider</A>
<DD>This handles model notifications by calling <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/edit/provider/ItemProviderAdapter.html?is-external=true#updateChildren(org.eclipse.emf.common.notify.Notification)" title="class or interface in org.eclipse.emf.edit.provider"><CODE>ItemProviderAdapter.updateChildren(org.eclipse.emf.common.notify.Notification)</CODE></A> to update any cached children and by creating a
@@ -9739,7 +9752,7 @@ Method in interface org.eclipse.emf.spi.cdo.<A HREF="./org/eclipse/emf/spi/cdo/I
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html#postTraverseFeature(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.ecore.EStructuralFeature, int, java.lang.Object)"><B>postTraverseFeature(CDOObject, EStructuralFeature, int, Object)</B></A> -
Method in interface org.eclipse.emf.cdo.view.<A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view">CDOFeatureAnalyzer</A>
-<DD>TODO Simon: JavaDoc
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/spi/server/InternalCommitManager.html#preCommit(org.eclipse.emf.cdo.spi.server.InternalCommitContext, org.eclipse.net4j.util.om.monitor.OMMonitor)"><B>preCommit(InternalCommitContext, OMMonitor)</B></A> -
Method in interface org.eclipse.emf.cdo.spi.server.<A HREF="./org/eclipse/emf/cdo/spi/server/InternalCommitManager.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalCommitManager</A>
<DD>Create a future to execute commitContext in a different thread.
@@ -9775,7 +9788,7 @@ Static method in class org.eclipse.emf.cdo.util.<A HREF="./org/eclipse/emf/cdo/u
<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html#preTraverseFeature(org.eclipse.emf.cdo.CDOObject, org.eclipse.emf.ecore.EStructuralFeature, int)"><B>preTraverseFeature(CDOObject, EStructuralFeature, int)</B></A> -
Method in interface org.eclipse.emf.cdo.view.<A HREF="./org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view">CDOFeatureAnalyzer</A>
-<DD>TODO Simon: JavaDoc
+<DD>&nbsp;
<DT><A HREF="./org/eclipse/emf/cdo/spi/server/InternalCommitContext.html#preWrite()"><B>preWrite()</B></A> -
Method in interface org.eclipse.emf.cdo.spi.server.<A HREF="./org/eclipse/emf/cdo/spi/server/InternalCommitContext.html" title="interface in org.eclipse.emf.cdo.spi.server">InternalCommitContext</A>
<DD>&nbsp;
@@ -10889,7 +10902,7 @@ Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/t
<DD>Synchronously executes the delegate handler's <A HREF="./org/eclipse/emf/cdo/transaction/CDOAsyncTransactionHandler.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)"><CODE>rolledBackTransaction()</CODE></A> method.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)"><B>rolledBackTransaction(CDOTransaction)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A>
-<DD>&nbsp;
+<DD>This implementation does nothing.
<DT><A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)"><B>rolledBackTransaction(CDOTransaction)</B></A> -
Method in class org.eclipse.emf.cdo.transaction.<A HREF="./org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A>
<DD>&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html
index 58207e2fc2..c409428210 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/class-use/CDOObject.html
@@ -866,7 +866,7 @@ Uses of <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="inter
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>&nbsp;value)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -876,7 +876,7 @@ Uses of <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="inter
int&nbsp;index)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -966,7 +966,7 @@ Uses of <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="inter
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html
index 3a662560e8..cef1e70682 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/branch/class-use/CDOBranchPoint.html
@@ -1519,7 +1519,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/branch/CDOBranc
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonTransaction.html
index 77948e834e..550f20bf72 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonTransaction.html
@@ -194,7 +194,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonTransacti
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonView.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonView.html
index 41e7ad5e10..bf04df6023 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonView.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/class-use/CDOCommonView.html
@@ -349,7 +349,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html
index cb5eef30ac..1ee1908121 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSet.html
@@ -152,7 +152,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChang
<A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html
index 445e60c264..a37896bdc0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetData.html
@@ -636,7 +636,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChang
<A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetDataProvider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetDataProvider.html
index edee4b3aea..dffbe9b7b4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetDataProvider.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/commit/class-use/CDOChangeSetDataProvider.html
@@ -149,7 +149,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChang
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;One in a sequence of possibly several points in time of a <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -173,7 +174,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/commit/CDOChang
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOID.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOID.html
index 30411849d8..f620598b30 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOID.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOID.html
@@ -2787,7 +2787,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html"
<TD><CODE><B>CDOFetchRuleManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getContext()">getContext</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
@@ -2884,7 +2884,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html"
<TD><CODE><B>CDOFetchRuleManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getFetchRules(java.util.Collection)">getFetchRules</A></B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;&nbsp;ids)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOWithID.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOWithID.html
index c986e87887..affdf06287 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOWithID.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/id/class-use/CDOWithID.html
@@ -314,7 +314,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/id/CDOWithID.ht
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageTypeRegistry.CDOObjectMarker.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageTypeRegistry.CDOObjectMarker.html
index ffdaf606e1..4cc7d54d43 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageTypeRegistry.CDOObjectMarker.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/class-use/CDOPackageTypeRegistry.CDOObjectMarker.html
@@ -202,7 +202,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/model/CDOPackag
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html
index c9f3234b2c..3f20b66171 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/model/package-tree.html
@@ -137,7 +137,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.Type</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.State</B></A></UL>
+<LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.State.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.State</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.model.<A HREF="../../../../../../org/eclipse/emf/cdo/common/model/CDOPackageUnit.Type.html" title="enum in org.eclipse.emf.cdo.common.model"><B>CDOPackageUnit.Type</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html
index 252fd94473..97c255d86a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/package-tree.html
@@ -131,7 +131,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.State</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.Type</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateMode.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.PassiveUpdateMode</B></A></UL>
+<LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.State.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.State</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonSession.Options.PassiveUpdateMode.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonSession.Options.PassiveUpdateMode</B></A><LI TYPE="circle">org.eclipse.emf.cdo.common.<A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.Type.html" title="enum in org.eclipse.emf.cdo.common"><B>CDOCommonRepository.Type</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionProvider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionProvider.html
index 52e4a16b2f..e676725310 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionProvider.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/revision/class-use/CDORevisionProvider.html
@@ -417,7 +417,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/revision/CDORev
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOQueryInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOQueryInfo.html
index c0f952e12e..2f7aea062a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOQueryInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/CDOQueryInfo.html
@@ -100,6 +100,11 @@ Interface CDOQueryInfo</H2>
</PRE>
<P>
+Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOFetchRule.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOFetchRule.html
index 40d0fc1451..a3c1c317ba 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOFetchRule.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOFetchRule.html
@@ -116,7 +116,7 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/util/CDOFetchRu
<TD><CODE><B>CDOFetchRuleManager.</B><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getFetchRules(java.util.Collection)">getFetchRules</A></B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;&nbsp;ids)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html
index 4177915f28..edecfeb879 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html
@@ -295,7 +295,8 @@ Uses of <A HREF="../../../../../../../org/eclipse/emf/cdo/common/util/CDOQueryIn
<TD><CODE><B><A HREF="../../../../../../../org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view">CDOQuery</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides access to the information that specifies a query from a <A HREF="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A> and to the results of the remote query execution;</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html
index 918fa6d5ac..5bf3ff1b33 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-summary.html
@@ -100,7 +100,8 @@ Common utility classes, some common interfaces and exceptions.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOQueryInfo.html" title="interface in org.eclipse.emf.cdo.common.util">CDOQueryInfo</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/CDOTimeProvider.html" title="interface in org.eclipse.emf.cdo.common.util">CDOTimeProvider</A></B></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-use.html
index 380b5cc7e1..fcaf872ccf 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/common/util/package-use.html
@@ -188,7 +188,8 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/package-su
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html#org.eclipse.emf.cdo.server"><B>CDOQueryInfo</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOTimeProvider.html#org.eclipse.emf.cdo.server"><B>CDOTimeProvider</B></A></B>
@@ -209,7 +210,8 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/package-su
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html#org.eclipse.emf.cdo.server.ocl"><B>CDOQueryInfo</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -245,7 +247,8 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/package-su
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html#org.eclipse.emf.cdo.spi.common"><B>CDOQueryInfo</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryQueue.html#org.eclipse.emf.cdo.spi.common"><B>CDOQueryQueue</B></A></B>
@@ -287,7 +290,8 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/package-su
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html#org.eclipse.emf.cdo.spi.server"><B>CDOQueryInfo</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryQueue.html#org.eclipse.emf.cdo.spi.server"><B>CDOQueryQueue</B></A></B>
@@ -335,7 +339,8 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/package-su
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html#org.eclipse.emf.cdo.view"><B>CDOQueryInfo</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -356,7 +361,8 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/common/util/package-su
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/common/util/class-use/CDOQueryInfo.html#org.eclipse.emf.spi.cdo"><B>CDOQueryInfo</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encapsulates all the transferrable information that fully specifies a query from a <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/CDOResourceFactory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/CDOResourceFactory.html
index 1a89bd2434..8f07c566d4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/CDOResourceFactory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/CDOResourceFactory.html
@@ -103,6 +103,10 @@ Interface CDOResourceFactory</H2>
</PRE>
<P>
+Creates <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.
+<P>
+
+<P>
<DL>
<DT><B>Author:</B></DT>
<DD>Eike Stepper</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourceFactory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourceFactory.html
index bc72c0b939..bce6a62175 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourceFactory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourceFactory.html
@@ -103,8 +103,8 @@ Interface EresourceFactory</H2>
</PRE>
<P>
-<!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
- the model.
+<!-- begin-user-doc --> The <b>Factory</b> for the Eresource model. It provides a create method for each non-abstract
+ class of the model.
<P>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourcePackage.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourcePackage.html
index 2b06ab4cee..1f1b6a517d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourcePackage.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/EresourcePackage.html
@@ -103,7 +103,8 @@ Interface EresourcePackage</H2>
</PRE>
<P>
-<!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
+<!-- begin-user-doc --> The <b>Package</b> for the Eresource model. It contains accessors for the meta objects to
+ represent
<ul>
<li>each class,</li>
<li>each feature of each class,</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html
index 06987ffcc0..a08526fd41 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html
@@ -149,7 +149,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResourceFact
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">CDOResourceFactoryImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates default <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html
index 01439b9ae0..9f136b16ae 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html
@@ -104,6 +104,10 @@ Class CDOResourceFactoryImpl</H2>
</PRE>
<P>
+Creates default <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.
+<P>
+
+<P>
<DL>
<DT><B>Author:</B></DT>
<DD>Eike Stepper</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html
index cb900b69b3..22d87a54a3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/impl/package-summary.html
@@ -96,7 +96,7 @@ The generated EMF implementation of the CDO repository file system.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/eresource/impl/CDOResourceFactoryImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">CDOResourceFactoryImpl</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Creates default <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/eresource/impl/CDOResourceFolderImpl.html" title="class in org.eclipse.emf.cdo.eresource.impl">CDOResourceFolderImpl</A></B></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html
index 9d5f9c8d5c..ccfec08cc9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-summary.html
@@ -100,7 +100,7 @@ The generated EMF API of the CDO repository file system.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResourceFactory.html" title="interface in org.eclipse.emf.cdo.eresource">CDOResourceFactory</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Creates <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResourceFolder.html" title="interface in org.eclipse.emf.cdo.eresource">CDOResourceFolder</A></B></TD>
@@ -112,11 +112,11 @@ The generated EMF API of the CDO repository file system.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/EresourceFactory.html" title="interface in org.eclipse.emf.cdo.eresource">EresourceFactory</A></B></TD>
-<TD>The <b>Factory</b> for the model.</TD>
+<TD>The <b>Factory</b> for the Eresource model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/EresourcePackage.html" title="interface in org.eclipse.emf.cdo.eresource">EresourcePackage</A></B></TD>
-<TD>The <b>Package</b> for the model.</TD>
+<TD>The <b>Package</b> for the Eresource model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/EresourcePackage.Literals.html" title="interface in org.eclipse.emf.cdo.eresource">EresourcePackage.Literals</A></B></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-use.html
index 65a51b9503..b8b9232ffa 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/eresource/package-use.html
@@ -171,7 +171,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/eresource/package-summary
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html#org.eclipse.emf.cdo.eresource"><B>CDOResourceFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/CDOResourceFolder.html#org.eclipse.emf.cdo.eresource"><B>CDOResourceFolder</B></A></B>
@@ -189,13 +189,13 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/eresource/package-summary
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/EresourceFactory.html#org.eclipse.emf.cdo.eresource"><B>EresourceFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the Eresource model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/EresourcePackage.html#org.eclipse.emf.cdo.eresource"><B>EresourcePackage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the Eresource model.</TD>
</TR>
</TABLE>
&nbsp;
@@ -216,7 +216,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/eresource/package-summary
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html#org.eclipse.emf.cdo.eresource.impl"><B>CDOResourceFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/CDOResourceFolder.html#org.eclipse.emf.cdo.eresource.impl"><B>CDOResourceFolder</B></A></B>
@@ -234,13 +234,13 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/eresource/package-summary
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/EresourceFactory.html#org.eclipse.emf.cdo.eresource.impl"><B>EresourceFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the Eresource model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/EresourcePackage.html#org.eclipse.emf.cdo.eresource.impl"><B>EresourcePackage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the Eresource model.</TD>
</TR>
</TABLE>
&nbsp;
@@ -273,7 +273,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/eresource/package-summary
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/EresourcePackage.html#org.eclipse.emf.cdo.eresource.util"><B>EresourcePackage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the Eresource model.</TD>
</TR>
</TABLE>
&nbsp;
@@ -393,7 +393,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/eresource/package-summary
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/CDOResourceFactory.html#org.eclipse.emf.cdo.view"><B>CDOResourceFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>CDOResource</CODE></A> instances.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/eresource/class-use/CDOResourceFolder.html#org.eclipse.emf.cdo.view"><B>CDOResourceFolder</B></A></B>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesFactory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesFactory.html
index 09b7c65ebb..97079feb26 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesFactory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesFactory.html
@@ -103,8 +103,8 @@ Interface EtypesFactory</H2>
</PRE>
<P>
-<!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
- the model.
+<!-- begin-user-doc --> The <b>Factory</b> for the Etypes model. It provides a create method for each non-abstract
+ class of the model.
<P>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesPackage.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesPackage.html
index a667c3d53d..fe323d590e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesPackage.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/EtypesPackage.html
@@ -103,7 +103,8 @@ Interface EtypesPackage</H2>
</PRE>
<P>
-<!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta objects to represent
+<!-- begin-user-doc --> The <b>Package</b> for the Etypes model. It contains accessors for the meta objects to
+ represent
<ul>
<li>each class,</li>
<li>each feature of each class,</li>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html
index d39ebf75ea..d4207e0f2a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-summary.html
@@ -100,11 +100,11 @@ The generated EMF API of the CDO system data types and native annotations.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/EtypesFactory.html" title="interface in org.eclipse.emf.cdo.etypes">EtypesFactory</A></B></TD>
-<TD>The <b>Factory</b> for the model.</TD>
+<TD>The <b>Factory</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/EtypesPackage.html" title="interface in org.eclipse.emf.cdo.etypes">EtypesPackage</A></B></TD>
-<TD>The <b>Package</b> for the model.</TD>
+<TD>The <b>Package</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/EtypesPackage.Literals.html" title="interface in org.eclipse.emf.cdo.etypes">EtypesPackage.Literals</A></B></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-use.html
index 1e7748d1cb..978acf99ca 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/etypes/package-use.html
@@ -120,13 +120,13 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/etypes/package-summary.ht
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/EtypesFactory.html#org.eclipse.emf.cdo.etypes"><B>EtypesFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/EtypesPackage.html#org.eclipse.emf.cdo.etypes"><B>EtypesPackage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/ModelElement.html#org.eclipse.emf.cdo.etypes"><B>ModelElement</B></A></B>
@@ -153,13 +153,13 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/etypes/package-summary.ht
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/EtypesFactory.html#org.eclipse.emf.cdo.etypes.impl"><B>EtypesFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Factory</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/EtypesPackage.html#org.eclipse.emf.cdo.etypes.impl"><B>EtypesPackage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/ModelElement.html#org.eclipse.emf.cdo.etypes.impl"><B>ModelElement</B></A></B>
@@ -186,7 +186,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/etypes/package-summary.ht
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/EtypesPackage.html#org.eclipse.emf.cdo.etypes.util"><B>EtypesPackage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the model.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The <b>Package</b> for the Etypes model.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/etypes/class-use/ModelElement.html#org.eclipse.emf.cdo.etypes.util"><B>ModelElement</B></A></B>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html
index 98a1a692ef..a315f1f53c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/server/package-tree.html
@@ -246,7 +246,7 @@ Enum Hierarchy
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><B>Object</B></A><UL>
<LI TYPE="circle">java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><B>Enum</B></A>&lt;E&gt; (implements java.lang.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</A>&lt;T&gt;, java.io.<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</A>)
<UL>
-<LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.ChangeFormat.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.ChangeFormat</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionTemporality.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionTemporality</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionParallelism.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionParallelism</B></A></UL>
+<LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionTemporality.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionTemporality</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.RevisionParallelism.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.RevisionParallelism</B></A><LI TYPE="circle">org.eclipse.emf.cdo.server.<A HREF="../../../../../org/eclipse/emf/cdo/server/IStore.ChangeFormat.html" title="enum in org.eclipse.emf.cdo.server"><B>IStore.ChangeFormat</B></A></UL>
</UL>
</UL>
<HR>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html
index 77b767647b..c28793de43 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html
@@ -104,6 +104,11 @@ Class CDORetryExceptionHandler</H2>
</PRE>
<P>
+A <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSession.ExceptionHandler.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session exection handler</CODE></A> that retries the failed protocol operation a configurable number
+ of times.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html
index d35126a199..69d1c30495 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html
@@ -103,6 +103,10 @@ Interface CDOSessionConfigurationFactory</H2>
</PRE>
<P>
+Creates <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionProvider.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionProvider.html
index 6fc55a5de4..fdd7fe83b5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionProvider.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/CDOSessionProvider.html
@@ -97,6 +97,10 @@ Interface CDOSessionProvider</H2>
</PRE>
<P>
+Provides consumers with <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> instances.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOCollectionLoadingPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOCollectionLoadingPolicy.html
index 0d84c1e92e..8d1aa8b856 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOCollectionLoadingPolicy.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOCollectionLoadingPolicy.html
@@ -192,7 +192,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOCollectionLoad
<TD><CODE><B>CDOFetchRuleManager.</B><B><A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getCollectionLoadingPolicy()">getCollectionLoadingPolicy</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOSession.ExceptionHandler.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOSession.ExceptionHandler.html
index aaed04e0bc..9bcd002969 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOSession.ExceptionHandler.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/class-use/CDOSession.ExceptionHandler.html
@@ -124,7 +124,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOSession.Except
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session">CDORetryExceptionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/session/CDOSession.ExceptionHandler.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session exection handler</CODE></A> that retries the failed protocol operation a configurable number
+ of times.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html
index 6a1a495e99..3e7838ae92 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-summary.html
@@ -145,7 +145,7 @@ Client concepts for dealing with sessions to remote repositories.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfigurationFactory.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionConfigurationFactory</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Creates <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionEvent.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionEvent</A></B></TD>
@@ -158,7 +158,7 @@ Client concepts for dealing with sessions to remote repositories.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionProvider.html" title="interface in org.eclipse.emf.cdo.session">CDOSessionProvider</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Provides consumers with <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSession.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session</CODE></A> instances.</TD>
</TR>
</TABLE>
&nbsp;
@@ -172,7 +172,8 @@ Client concepts for dealing with sessions to remote repositories.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/session/CDORetryExceptionHandler.html" title="class in org.eclipse.emf.cdo.session">CDORetryExceptionHandler</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSession.ExceptionHandler.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session exection handler</CODE></A> that retries the failed protocol operation a configurable number
+ of times.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-use.html
index fc15548640..302937df46 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/package-use.html
@@ -154,7 +154,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/session/package-summary.h
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/session/class-use/CDOSessionConfigurationFactory.html#org.eclipse.emf.cdo.location"><B>CDOSessionConfigurationFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.</TD>
</TR>
</TABLE>
&nbsp;
@@ -208,7 +208,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/session/package-summary.h
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/session/class-use/CDOSessionConfigurationFactory.html#org.eclipse.emf.cdo.server"><B>CDOSessionConfigurationFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.</TD>
</TR>
</TABLE>
&nbsp;
@@ -229,7 +229,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/session/package-summary.h
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/session/class-use/CDOSessionConfigurationFactory.html#org.eclipse.emf.cdo.server.net4j"><B>CDOSessionConfigurationFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.</TD>
</TR>
</TABLE>
&nbsp;
@@ -313,7 +313,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/session/package-summary.h
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/session/class-use/CDOSessionConfigurationFactory.html#org.eclipse.emf.cdo.spi.server"><B>CDOSessionConfigurationFactory</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates <A HREF="../../../../../org/eclipse/emf/cdo/session/CDOSessionConfiguration.html" title="interface in org.eclipse.emf.cdo.session"><CODE>session configuration</CODE></A> instances.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html
index 50fb1bae84..4b7d02d5c3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html
@@ -108,6 +108,10 @@ Class CDORemoteSessionManager.EventAdapter</H2>
</PRE>
<P>
+A default adapter for all kinds of <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A> related events.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html
index 54b67f1a5b..aab43e8ab3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.html
@@ -150,7 +150,7 @@ Provides collaborative access to the <A HREF="../../../../../../org/eclipse/emf/
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html" title="class in org.eclipse.emf.cdo.session.remote">CDORemoteSessionManager.EventAdapter</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A default adapter for all kinds of <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A> related events.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html
index 4276e6c9dc..1b545693c1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html
@@ -108,6 +108,10 @@ Enum CDORemoteSessionMessage.Priority</H2>
</PRE>
<P>
+Enumerates the possible <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><CODE>remote session message</CODE></A> priorities.
+<P>
+
+<P>
<DL>
<DT><B>Author:</B></DT>
<DD>Eike Stepper</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html
index 3cd53c2602..53559acd2b 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html
@@ -101,6 +101,10 @@ Class CDORemoteSessionMessage</H2>
</PRE>
<P>
+A message from a <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
@@ -124,7 +128,7 @@ Class CDORemoteSessionMessage</H2>
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html" title="enum in org.eclipse.emf.cdo.session.remote">CDORemoteSessionMessage.Priority</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Enumerates the possible <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><CODE>remote session message</CODE></A> priorities.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html
index fdb6d7dc65..8a0a332d78 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-summary.html
@@ -140,11 +140,11 @@ Client concepts for the communication and collaboration with other sessions.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionManager.EventAdapter.html" title="class in org.eclipse.emf.cdo.session.remote">CDORemoteSessionManager.EventAdapter</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A default adapter for all kinds of <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A> related events.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote">CDORemoteSessionMessage</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A message from a <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -158,7 +158,7 @@ Client concepts for the communication and collaboration with other sessions.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.Priority.html" title="enum in org.eclipse.emf.cdo.session.remote">CDORemoteSessionMessage.Priority</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Enumerates the possible <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><CODE>remote session message</CODE></A> priorities.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-use.html
index 361c9c3127..35faaf491e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/session/remote/package-use.html
@@ -156,13 +156,13 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/package
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/class-use/CDORemoteSessionMessage.html#org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionMessage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A message from a <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/class-use/CDORemoteSessionMessage.Priority.html#org.eclipse.emf.cdo.session.remote"><B>CDORemoteSessionMessage.Priority</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Enumerates the possible <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSessionMessage.html" title="class in org.eclipse.emf.cdo.session.remote"><CODE>remote session message</CODE></A> priorities.</TD>
</TR>
</TABLE>
&nbsp;
@@ -177,7 +177,7 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/package
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/class-use/CDORemoteSessionMessage.html#org.eclipse.emf.cdo.spi.server"><B>CDORemoteSessionMessage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A message from a <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -207,7 +207,7 @@ Classes in <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/package
<TD><B><A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/class-use/CDORemoteSessionMessage.html#org.eclipse.emf.spi.cdo"><B>CDORemoteSessionMessage</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A message from a <A HREF="../../../../../../org/eclipse/emf/cdo/session/remote/CDORemoteSession.html" title="interface in org.eclipse.emf.cdo.session.remote"><CODE>remote session</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html
index 85d10e8344..110ab311f4 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html
@@ -105,6 +105,11 @@ Class CDOAutoAttacher</H2>
</PRE>
<P>
+A <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction handler</CODE></A> that automatically attaches cross-referenced objects to the
+ <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> that contains the referencing <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html
index ead8c06ab8..8c38d57eae 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html
@@ -103,6 +103,10 @@ Interface CDOConflictResolver2</H2>
</PRE>
<P>
+A strategy used to customize the default conflict resolution behaviour of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html
index e8b46ab6b6..05cfd5d10e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html
@@ -105,6 +105,10 @@ Class CDODefaultTransactionHandler</H2>
</PRE>
<P>
+An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
@@ -148,7 +152,7 @@ Class CDODefaultTransactionHandler</H2>
<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Called by a <code>CDOTransaction</code> <b>after</b> it is being committed.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -157,7 +161,7 @@ Class CDODefaultTransactionHandler</H2>
<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Called by a <code>CDOTransaction</code> <b>before</b> it is being committed.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -165,7 +169,7 @@ Class CDODefaultTransactionHandler</H2>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)">rolledBackTransaction</A></B>(<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>&nbsp;transaction)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Called by a <code>CDOTransaction</code> <b>after</b> it is rolled back.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
</TABLE>
&nbsp;<A NAME="methods_inherited_from_class_org.eclipse.emf.cdo.transaction.CDODefaultTransactionHandler1"><!-- --></A>
@@ -231,11 +235,7 @@ committingTransaction</H3>
public void <B>committingTransaction</B>(<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>&nbsp;transaction,
<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committingTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)">CDOTransactionHandler2</A></CODE></B></DD>
-<DD>Called by a <code>CDOTransaction</code> <b>before</b> it is being committed. The implementor of this method is
- allowed to throw an unchecked exception that will propagate up to the operation that is about to commit the
- transaction (thereby preventing the operation from completing successfully). The implementor of this method is
- allowed to apply changes to the object graph managed by the transaction.
+<DD>This implementation does nothing. Clients may override to provide specialized behaviour.
<P>
<DD><DL>
<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committingTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)">committingTransaction</A></CODE> in interface <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</A></CODE></DL>
@@ -251,9 +251,7 @@ rolledBackTransaction</H3>
<PRE>
public void <B>rolledBackTransaction</B>(<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>&nbsp;transaction)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)">CDOTransactionHandler2</A></CODE></B></DD>
-<DD>Called by a <code>CDOTransaction</code> <b>after</b> it is rolled back. If the implementor of this method throws an
- exception it will be logged as an error and subsequent handlers will be further called.
+<DD>This implementation does nothing. Clients may override to provide specialized behaviour.
<P>
<DD><DL>
<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)">rolledBackTransaction</A></CODE> in interface <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</A></CODE></DL>
@@ -270,9 +268,7 @@ committedTransaction</H3>
public void <B>committedTransaction</B>(<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>&nbsp;transaction,
<A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</PRE>
<DL>
-<DD><B>Description copied from interface: <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committedTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)">CDOTransactionHandler2</A></CODE></B></DD>
-<DD>Called by a <code>CDOTransaction</code> <b>after</b> it is being committed. The implementor of this method is
- <b>not</b> allowed to throw an unchecked exception.
+<DD>This implementation does nothing. Clients may override to provide specialized behaviour.
<P>
<DD><DL>
<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html#committedTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction, org.eclipse.emf.cdo.transaction.CDOCommitContext)">committedTransaction</A></CODE> in interface <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</A></CODE></DL>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html
index 93d277a712..fc59b85a81 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html
@@ -107,6 +107,10 @@ Class CDODefaultTransactionHandler1</H2>
</PRE>
<P>
+An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html
index e36bbe3817..a2e2fd85c3 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html
@@ -104,6 +104,10 @@ Class CDODefaultTransactionHandler2</H2>
</PRE>
<P>
+An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html
index e3877ee1ba..7d0d11f40e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html
@@ -110,6 +110,11 @@ Class CDOMerger.ConflictException</H2>
</PRE>
<P>
+Thrown from a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>merger</CODE></A> in case of conflicting changes in the a source and target
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change sets</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.html
index d9369b1133..5bbf72eb3f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOMerger.html
@@ -100,6 +100,11 @@ Interface CDOMerger</H2>
</PRE>
<P>
+Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A>
+ and returns the result relative to their common ancestor.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
@@ -123,7 +128,8 @@ Interface CDOMerger</H2>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Thrown from a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>merger</CODE></A> in case of conflicting changes in the a source and target
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change sets</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -142,7 +148,8 @@ Interface CDOMerger</H2>
<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.</TD>
</TR>
</TABLE>
&nbsp;
@@ -165,6 +172,9 @@ merge</H3>
<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)
throws <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</A></PRE>
<DL>
+<DD>Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.
+<P>
<DD><DL>
<DT><B>Throws:</B>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPushTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPushTransaction.html
index f7a45270a2..1383ec7a25 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPushTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOPushTransaction.html
@@ -105,6 +105,11 @@ Class CDOPushTransaction</H2>
</PRE>
<P>
+A <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOSavepoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOSavepoint.html
index 87f0e45bdb..42a06a514d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOSavepoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOSavepoint.html
@@ -103,6 +103,11 @@ Interface CDOSavepoint</H2>
</PRE>
<P>
+One in a sequence of possibly several points in time of a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.
+<P>
+
+<P>
<DL>
<DT><B>Author:</B></DT>
<DD>Eike Stepper</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html
index 5c5e06d1ab..3bf04308e8 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html
@@ -103,6 +103,10 @@ Interface CDOTransactionHandler</H2>
</PRE>
<P>
+A combination of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html
index b3a0d61d56..b0363cf37c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html
@@ -106,6 +106,11 @@ Interface CDOTransactionHandler1</H2>
</PRE>
<P>
+A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A> are
+ attached, modified or detached.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html
index e85fc0b5fd..dbd087da8a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html
@@ -106,6 +106,11 @@ Interface CDOTransactionHandler2</H2>
</PRE>
<P>
+A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when it is about to be committed, has
+ been committed or rolled back.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html
index 47359f0db6..a94cfc1343 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html
@@ -103,6 +103,11 @@ Interface CDOTransactionHandlerBase</H2>
</PRE>
<P>
+A marker interface for use with <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#addTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.addTransactionHandler()</CODE></A> and
+ <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#removeTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.removeTransactionHandler()</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>4.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOUserTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOUserTransaction.html
index cd66e1a3a4..ebe933700c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOUserTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOUserTransaction.html
@@ -103,7 +103,7 @@ Interface CDOUserTransaction</H2>
</PRE>
<P>
-Only deal with transaction process.
+Provides functionality that is common to both <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>single</CODE></A> transactions and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>distributed</CODE></A> (XA) transactions.
<P>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXASavepoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXASavepoint.html
index 5af3087faa..b259705458 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXASavepoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXASavepoint.html
@@ -103,6 +103,12 @@ Interface CDOXASavepoint</H2>
</PRE>
<P>
+Creates a save point in a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOXATransaction</CODE></A> that can be used to roll back a part of the transaction.
+ <p>
+ <b>Note:</b> Save points do not flush to disk. Everything is done in memory on the client side.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXATransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXATransaction.html
index ee2f6ba6fd..32e191b155 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXATransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/CDOXATransaction.html
@@ -103,6 +103,11 @@ Interface CDOXATransaction</H2>
</PRE>
<P>
+A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOCommitContext.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOCommitContext.html
index 64d31fe8df..5d862c99fe 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOCommitContext.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOCommitContext.html
@@ -130,7 +130,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitCont
<A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -166,7 +166,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitCont
<A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html
index 25a29bc8bd..74926b4c1c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver.html
@@ -120,7 +120,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictRe
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver2</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A strategy used to customize the default conflict resolution behaviour of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDODefaultTransactionHandler1.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDODefaultTransactionHandler1.html
index 8450e0d1b6..fc5cf57545 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDODefaultTransactionHandler1.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDODefaultTransactionHandler1.html
@@ -116,7 +116,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTra
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction">CDOAutoAttacher</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction handler</CODE></A> that automatically attaches cross-referenced objects to the
+ <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> that contains the referencing <A HREF="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -124,7 +125,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTra
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html
index b33ea310c3..c3da7ad101 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html
@@ -121,7 +121,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.Con
<A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html
index 5ff2d2fde7..b9ce98a47e 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html
@@ -220,7 +220,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -338,7 +339,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -374,7 +375,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOCommitContext.html" title="interface in org.eclipse.emf.cdo.transaction">CDOCommitContext</A>&nbsp;commitContext)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -483,7 +484,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B>CDODefaultTransactionHandler.</B><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html#rolledBackTransaction(org.eclipse.emf.cdo.transaction.CDOTransaction)">rolledBackTransaction</A></B>(<A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A>&nbsp;transaction)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;This implementation does nothing.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler.html
index 783482a23e..cf77704129 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler.html
@@ -124,7 +124,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html
index bc2ccb1aeb..078b95092d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html
@@ -116,7 +116,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A combination of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -140,7 +140,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction">CDOAutoAttacher</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction handler</CODE></A> that automatically attaches cross-referenced objects to the
+ <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> that contains the referencing <A HREF="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -148,7 +149,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -156,7 +157,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler1</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler2.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler2.html
index ec68d6286b..7f8342ad97 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler2.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler2.html
@@ -116,7 +116,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A combination of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -140,7 +140,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -148,7 +148,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html
index 748bd2987e..9fd00a8ef9 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html
@@ -116,7 +116,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A combination of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -124,7 +124,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A call-back interface that is called by a <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when <A HREF="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A> are
+ attached, modified or detached.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -132,7 +133,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A call-back interface that is called by a <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when it is about to be committed, has
+ been committed or rolled back.</TD>
</TR>
</TABLE>
&nbsp;
@@ -156,7 +158,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction">CDOAutoAttacher</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction handler</CODE></A> that automatically attaches cross-referenced objects to the
+ <A HREF="../../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> that contains the referencing <A HREF="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -164,7 +167,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -172,7 +175,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler1</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -180,7 +183,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactio
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserSavepoint.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserSavepoint.html
index d1698374c1..b57aa42e26 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserSavepoint.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserSavepoint.html
@@ -120,7 +120,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepo
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;One in a sequence of possibly several points in time of a <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -128,7 +129,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepo
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOXASavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOXASavepoint</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a save point in a <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOXATransaction</CODE></A> that can be used to roll back a part of the transaction.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html
index 747a608d5b..25b8f9854d 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html
@@ -128,7 +128,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOUserTransa
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOXATransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -144,7 +145,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOUserTransa
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html
index a416133083..283785d5bd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-summary.html
@@ -104,15 +104,17 @@ Client concepts for dealing with transactions, distributed transactions and thei
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOConflictResolver2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOConflictResolver2</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A strategy used to customize the default conflict resolution behaviour of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A>
+ and returns the result relative to their common ancestor.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOSavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOSavepoint</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>One in a sequence of possibly several points in time of a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransaction</A></B></TD>
@@ -145,19 +147,22 @@ Client concepts for dealing with transactions, distributed transactions and thei
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A combination of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler1</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A> are
+ attached, modified or detached.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandler2</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when it is about to be committed, has
+ been committed or rolled back.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandlerBase.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionHandlerBase</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A marker interface for use with <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#addTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.addTransactionHandler()</CODE></A> and
+ <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#removeTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.removeTransactionHandler()</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionStartedEvent.html" title="interface in org.eclipse.emf.cdo.transaction">CDOTransactionStartedEvent</A></B></TD>
@@ -170,15 +175,16 @@ Client concepts for dealing with transactions, distributed transactions and thei
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOUserTransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOUserTransaction</A></B></TD>
-<TD>Only deal with transaction process.</TD>
+<TD>Provides functionality that is common to both <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>single</CODE></A> transactions and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>distributed</CODE></A> (XA) transactions.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXASavepoint.html" title="interface in org.eclipse.emf.cdo.transaction">CDOXASavepoint</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Creates a save point in a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOXATransaction</CODE></A> that can be used to roll back a part of the transaction.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction">CDOXATransaction</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -196,23 +202,25 @@ Client concepts for dealing with transactions, distributed transactions and thei
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOAutoAttacher.html" title="class in org.eclipse.emf.cdo.transaction">CDOAutoAttacher</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction handler</CODE></A> that automatically attaches cross-referenced objects to the
+ <A HREF="../../../../../org/eclipse/emf/cdo/eresource/CDOResource.html" title="interface in org.eclipse.emf.cdo.eresource"><CODE>resource</CODE></A> that contains the referencing <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>object</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler1.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler1</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDODefaultTransactionHandler2.html" title="class in org.eclipse.emf.cdo.transaction">CDODefaultTransactionHandler2</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -240,7 +248,8 @@ Client concepts for dealing with transactions, distributed transactions and thei
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Thrown from a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>merger</CODE></A> in case of conflicting changes in the a source and target
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change sets</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html
index 0d54b77e44..297146dc55 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/transaction/package-use.html
@@ -145,25 +145,28 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/transaction/package-summa
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDODefaultTransactionHandler1.html#org.eclipse.emf.cdo.transaction"><B>CDODefaultTransactionHandler1</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;An empty default implementation of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html#org.eclipse.emf.cdo.transaction"><B>CDOMerger</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A>
+ and returns the result relative to their common ancestor.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html#org.eclipse.emf.cdo.transaction"><B>CDOMerger.ConflictException</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Thrown from a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>merger</CODE></A> in case of conflicting changes in the a source and target
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change sets</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOSavepoint.html#org.eclipse.emf.cdo.transaction"><B>CDOSavepoint</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;One in a sequence of possibly several points in time of a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html#org.eclipse.emf.cdo.transaction"><B>CDOTransaction</B></A></B>
@@ -187,25 +190,28 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/transaction/package-summa
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler.html#org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A combination of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler1.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler1</CODE></A> and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransactionHandler2.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOTransactionHandler2</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler1.html#org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler1</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A> are
+ attached, modified or detached.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandler2.html#org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandler2</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transcation</CODE></A> when it is about to be committed, has
+ been committed or rolled back.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOTransactionHandlerBase.html#org.eclipse.emf.cdo.transaction"><B>CDOTransactionHandlerBase</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A marker interface for use with <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#addTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.addTransactionHandler()</CODE></A> and
+ <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html#removeTransactionHandler(org.eclipse.emf.cdo.transaction.CDOTransactionHandlerBase)"><CODE>CDOTransaction.removeTransactionHandler()</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOUserSavepoint.html#org.eclipse.emf.cdo.transaction"><B>CDOUserSavepoint</B></A></B>
@@ -217,19 +223,20 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/transaction/package-summa
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html#org.eclipse.emf.cdo.transaction"><B>CDOUserTransaction</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Only deal with transaction process.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides functionality that is common to both <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>single</CODE></A> transactions and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>distributed</CODE></A> (XA) transactions.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOXASavepoint.html#org.eclipse.emf.cdo.transaction"><B>CDOXASavepoint</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a save point in a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOXATransaction</CODE></A> that can be used to roll back a part of the transaction.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOXATransaction.html#org.eclipse.emf.cdo.transaction"><B>CDOXATransaction</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -244,7 +251,8 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/transaction/package-summa
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOXATransaction.html#org.eclipse.emf.cdo.util"><B>CDOXATransaction</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -271,25 +279,28 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/transaction/package-summa
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOConflictResolver2.html#org.eclipse.emf.spi.cdo"><B>CDOConflictResolver2</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A strategy used to customize the default conflict resolution behaviour of <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transactions</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOMerger.html#org.eclipse.emf.spi.cdo"><B>CDOMerger</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A>
+ and returns the result relative to their common ancestor.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOMerger.ConflictException.html#org.eclipse.emf.spi.cdo"><B>CDOMerger.ConflictException</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Thrown from a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>merger</CODE></A> in case of conflicting changes in the a source and target
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change sets</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOSavepoint.html#org.eclipse.emf.spi.cdo"><B>CDOSavepoint</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;One in a sequence of possibly several points in time of a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that encapsulates the
+ changes to transactional objects and that later changes can be <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOUserSavepoint.html#rollback()"><CODE>rolled back</CODE></A> to.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOTransaction.html#org.eclipse.emf.spi.cdo"><B>CDOTransaction</B></A></B>
@@ -307,19 +318,20 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/transaction/package-summa
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOUserTransaction.html#org.eclipse.emf.spi.cdo"><B>CDOUserTransaction</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Only deal with transaction process.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides functionality that is common to both <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>single</CODE></A> transactions and <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>distributed</CODE></A> (XA) transactions.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOXASavepoint.html#org.eclipse.emf.spi.cdo"><B>CDOXASavepoint</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Creates a save point in a <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOXATransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>CDOXATransaction</CODE></A> that can be used to roll back a part of the transaction.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/transaction/class-use/CDOXATransaction.html#org.eclipse.emf.spi.cdo"><B>CDOXATransaction</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A distributed (XA) transaction that can atomically commit the changes to multiple <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/resource/ResourceSet.html?is-external=true" title="class or interface in org.eclipse.emf.ecore.resource"><CODE>resource sets</CODE></A>,
+ each represented by a registered <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOViewSet.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view set</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/class-use/CDOUpdatable.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/class-use/CDOUpdatable.html
index c4a486c225..7663c71989 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/class-use/CDOUpdatable.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/util/class-use/CDOUpdatable.html
@@ -169,7 +169,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/util/CDOUpdatable.html" t
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html
index 58db22cec7..46a2731536 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOAdapterPolicy.html
@@ -100,7 +100,7 @@ Interface CDOAdapterPolicy</H2>
</PRE>
<P>
-Specifies an adapter policy.
+A policy that allows to specify valid <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>Adapter</CODE></A> / <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> combinations.
<P>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html
index aa2783dd2f..1a56dd22a0 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html
@@ -97,7 +97,7 @@ Interface CDOFeatureAnalyzer</H2>
</PRE>
<P>
-TODO Simon: JavaDoc
+A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> on each model read access.
<P>
<P>
@@ -124,7 +124,7 @@ TODO Simon: JavaDoc
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html#NOOP">NOOP</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
@@ -145,7 +145,7 @@ TODO Simon: JavaDoc
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>&nbsp;value)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -155,7 +155,7 @@ TODO Simon: JavaDoc
int&nbsp;index)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
@@ -176,8 +176,6 @@ NOOP</H3>
<PRE>
static final <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view">CDOFeatureAnalyzer</A> <B>NOOP</B></PRE>
<DL>
-<DD>TODO Simon: JavaDoc
-<P>
<DL>
</DL>
</DL>
@@ -199,11 +197,7 @@ void <B>preTraverseFeature</B>(<A HREF="../../../../../org/eclipse/emf/cdo/CDOOb
<A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EStructuralFeature.html?is-external=true" title="class or interface in org.eclipse.emf.ecore">EStructuralFeature</A>&nbsp;feature,
int&nbsp;index)</PRE>
<DL>
-<DD>TODO Simon: JavaDoc
-<P>
<DD><DL>
-<DT><B>Since:</B></DT>
- <DD>2.0</DD>
</DL>
</DD>
</DL>
@@ -217,11 +211,7 @@ void <B>postTraverseFeature</B>(<A HREF="../../../../../org/eclipse/emf/cdo/CDOO
int&nbsp;index,
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</A>&nbsp;value)</PRE>
<DL>
-<DD>TODO Simon: JavaDoc
-<P>
<DD><DL>
-<DT><B>Since:</B></DT>
- <DD>2.0</DD>
</DL>
</DD>
</DL>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFetchRuleManager.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFetchRuleManager.html
index 97cc35479e..682bd65b75 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFetchRuleManager.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOFetchRuleManager.html
@@ -97,7 +97,8 @@ Interface CDOFetchRuleManager</H2>
</PRE>
<P>
-TODO Simon: JavaDoc
+Collects and updates <A HREF="../../../../../org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util"><CODE>fetch rules</CODE></A> for <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A>, usually based on
+ <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><CODE>feature analyzer</CODE></A> statistics.
<P>
<P>
@@ -129,7 +130,7 @@ TODO Simon: JavaDoc
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getCollectionLoadingPolicy()">getCollectionLoadingPolicy</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -137,7 +138,7 @@ TODO Simon: JavaDoc
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getContext()">getContext</A></B>()</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -145,7 +146,7 @@ TODO Simon: JavaDoc
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html#getFetchRules(java.util.Collection)">getFetchRules</A></B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;&nbsp;ids)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
@@ -166,8 +167,6 @@ getContext</H3>
<PRE>
<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A> <B>getContext</B>()</PRE>
<DL>
-<DD>TODO Simon: JavaDoc
-<P>
<DD><DL>
</DL>
</DD>
@@ -179,8 +178,6 @@ getFetchRules</H3>
<PRE>
<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util">CDOFetchRule</A>&gt; <B>getFetchRules</B>(<A HREF="http://download.oracle.com/javase/1.5.0/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</A>&lt;<A HREF="../../../../../org/eclipse/emf/cdo/common/id/CDOID.html" title="interface in org.eclipse.emf.cdo.common.id">CDOID</A>&gt;&nbsp;ids)</PRE>
<DL>
-<DD>TODO Simon: JavaDoc
-<P>
<DD><DL>
</DL>
</DD>
@@ -192,11 +189,7 @@ getCollectionLoadingPolicy</H3>
<PRE>
<A HREF="../../../../../org/eclipse/emf/cdo/session/CDOCollectionLoadingPolicy.html" title="interface in org.eclipse.emf.cdo.session">CDOCollectionLoadingPolicy</A> <B>getCollectionLoadingPolicy</B>()</PRE>
<DL>
-<DD>TODO Simon: JavaDoc
-<P>
<DD><DL>
-<DT><B>Since:</B></DT>
- <DD>2.0</DD>
</DL>
</DD>
</DL>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html
index ce3242c8cc..fcb054f45a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html
@@ -97,12 +97,16 @@ Interface CDOInvalidationPolicy</H2>
</PRE>
<P>
+A strategy interface to customize the invalidation behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>3.0</DD>
<DT><B>Author:</B></DT>
<DD>Eike Stepper</DD>
-</DL>
+<DT><B>See Also:</B><DD><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#setInvalidationPolicy(org.eclipse.emf.cdo.view.CDOInvalidationPolicy)"><CODE>CDOView.Options.setInvalidationPolicy(CDOInvalidationPolicy)</CODE></A></DL>
<HR>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOQuery.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOQuery.html
index d6e68d126b..7b19f04cfa 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOQuery.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDOQuery.html
@@ -100,7 +100,8 @@ Interface CDOQuery</H2>
</PRE>
<P>
-TODO Simon: JavaDoc
+Provides access to the information that specifies a query from a <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A> and to the results of the remote query execution;
<P>
<P>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html
index ffb7257d99..1cf9163a85 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html
@@ -97,12 +97,16 @@ Interface CDORevisionPrefetchingPolicy</H2>
</PRE>
<P>
+A strategy interface to customize the <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revision</CODE></A> prefetching behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
<DT><B>Author:</B></DT>
<DD>Simon McDuff</DD>
-</DL>
+<DT><B>See Also:</B><DD><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.Options.html#setRevisionPrefetchingPolicy(org.eclipse.emf.cdo.view.CDORevisionPrefetchingPolicy)"><CODE>CDOView.Options.setRevisionPrefetchingPolicy(CDORevisionPrefetchingPolicy)</CODE></A></DL>
<HR>
<P>
@@ -192,7 +196,7 @@ loadAhead</H3>
<DL>
<DD><DL>
<DT><B>Parameters:</B><DD><CODE>revisionManager</CODE> - Lookup availability of objects in the cache with
- <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionManager.html#containsRevision(org.eclipse.emf.cdo.common.id.CDOID, org.eclipse.emf.cdo.common.branch.CDOBranchPoint)"><CODE>CDORevisionManager.containsRevision(CDOID, CDOBranchPoint)</CODE></A>.<DD><CODE>targetObject</CODE> - Container of the list<DD><CODE>feature</CODE> - <DD><CODE>list</CODE> - <DD><CODE>accessIndex</CODE> - <DD><CODE>accessID</CODE> -
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevisionManager.html#containsRevision(org.eclipse.emf.cdo.common.id.CDOID, org.eclipse.emf.cdo.common.branch.CDOBranchPoint)"><CODE>CDORevisionManager.containsRevision(CDOID, CDOBranchPoint)</CODE></A>.<DD><CODE>targetObject</CODE> - Container of the list
<DT><B>Returns:</B><DD>Should return a list of id's to be fetch.<DT><B>Since:</B></DT>
<DD>3.0</DD>
</DL>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html
index b7de119fa9..e9e9a5a028 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html
@@ -120,7 +120,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.h
<TD><CODE><B>CDOFeatureAnalyzer.</B><B><A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html#NOOP">NOOP</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOView.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOView.html
index 420ea1eb7e..29f5e918eb 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOView.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/class-use/CDOView.html
@@ -526,7 +526,8 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/cdo/view/CDOView.html" title=
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOPushTransaction.html" title="class in org.eclipse.emf.cdo.transaction">CDOPushTransaction</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A <A HREF="../../../../../../org/eclipse/emf/cdo/transaction/CDOTransaction.html" title="interface in org.eclipse.emf.cdo.transaction"><CODE>transaction</CODE></A> that persists changes to the object graph locally on commit and can later load
+ these changes and push them to the <A HREF="../../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html
index d4ee41cd10..0228894456 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-summary.html
@@ -96,19 +96,20 @@ Client concepts for dealing with views, view sets, queries, CDO objects and EMF
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOAdapterPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOAdapterPolicy</A></B></TD>
-<TD>Specifies an adapter policy.</TD>
+<TD>A policy that allows to specify valid <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>Adapter</CODE></A> / <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> combinations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view">CDOFeatureAnalyzer</A></B></TD>
-<TD>TODO Simon: JavaDoc</TD>
+<TD>A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> on each model read access.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFetchRuleManager.html" title="interface in org.eclipse.emf.cdo.view">CDOFetchRuleManager</A></B></TD>
-<TD>TODO Simon: JavaDoc</TD>
+<TD>Collects and updates <A HREF="../../../../../org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util"><CODE>fetch rules</CODE></A> for <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A>, usually based on
+ <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><CODE>feature analyzer</CODE></A> statistics.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOInvalidationPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDOInvalidationPolicy</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A strategy interface to customize the invalidation behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOObjectHandler.html" title="interface in org.eclipse.emf.cdo.view">CDOObjectHandler</A></B></TD>
@@ -117,11 +118,12 @@ Client concepts for dealing with views, view sets, queries, CDO objects and EMF
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOQuery.html" title="interface in org.eclipse.emf.cdo.view">CDOQuery</A></B></TD>
-<TD>TODO Simon: JavaDoc</TD>
+<TD>Provides access to the information that specifies a query from a <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A> and to the results of the remote query execution;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDORevisionPrefetchingPolicy.html" title="interface in org.eclipse.emf.cdo.view">CDORevisionPrefetchingPolicy</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>A strategy interface to customize the <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revision</CODE></A> prefetching behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/cdo/view/CDOStaleObject.html" title="interface in org.eclipse.emf.cdo.view">CDOStaleObject</A></B></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html
index fca8b69d6f..837f4f34d2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/cdo/view/package-use.html
@@ -226,7 +226,8 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/view/package-summary.html
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOFetchRuleManager.html#org.eclipse.emf.cdo.session"><B>CDOFetchRuleManager</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Collects and updates <A HREF="../../../../../org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util"><CODE>fetch rules</CODE></A> for <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A>, usually based on
+ <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><CODE>feature analyzer</CODE></A> statistics.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOView.html#org.eclipse.emf.cdo.session"><B>CDOView</B></A></B>
@@ -271,7 +272,8 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/view/package-summary.html
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOQuery.html#org.eclipse.emf.cdo.transaction"><B>CDOQuery</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides access to the information that specifies a query from a <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A> and to the results of the remote query execution;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOView.html#org.eclipse.emf.cdo.transaction"><B>CDOView</B></A></B>
@@ -327,7 +329,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/view/package-summary.html
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDORevisionPrefetchingPolicy.html#org.eclipse.emf.cdo.util"><B>CDORevisionPrefetchingPolicy</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A strategy interface to customize the <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revision</CODE></A> prefetching behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOView.html#org.eclipse.emf.cdo.util"><B>CDOView</B></A></B>
@@ -361,19 +363,19 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/view/package-summary.html
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOAdapterPolicy.html#org.eclipse.emf.cdo.view"><B>CDOAdapterPolicy</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specifies an adapter policy.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A policy that allows to specify valid <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>Adapter</CODE></A> / <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> combinations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html#org.eclipse.emf.cdo.view"><B>CDOFeatureAnalyzer</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> on each model read access.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOInvalidationPolicy.html#org.eclipse.emf.cdo.view"><B>CDOInvalidationPolicy</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A strategy interface to customize the invalidation behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOObjectHandler.html#org.eclipse.emf.cdo.view"><B>CDOObjectHandler</B></A></B>
@@ -386,13 +388,14 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/view/package-summary.html
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOQuery.html#org.eclipse.emf.cdo.view"><B>CDOQuery</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides access to the information that specifies a query from a <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonView.html" title="interface in org.eclipse.emf.cdo.common"><CODE>view</CODE></A> to a
+ <A HREF="../../../../../org/eclipse/emf/cdo/common/CDOCommonRepository.html" title="interface in org.eclipse.emf.cdo.common"><CODE>repository</CODE></A> and to the results of the remote query execution;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDORevisionPrefetchingPolicy.html#org.eclipse.emf.cdo.view"><B>CDORevisionPrefetchingPolicy</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A strategy interface to customize the <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revision</CODE></A> prefetching behaviour of a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOStaleReferencePolicy.html#org.eclipse.emf.cdo.view"><B>CDOStaleReferencePolicy</B></A></B>
@@ -473,19 +476,20 @@ Classes in <A HREF="../../../../../org/eclipse/emf/cdo/view/package-summary.html
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOAdapterPolicy.html#org.eclipse.emf.spi.cdo"><B>CDOAdapterPolicy</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Specifies an adapter policy.</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A policy that allows to specify valid <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/common/notify/Adapter.html?is-external=true" title="class or interface in org.eclipse.emf.common.notify"><CODE>Adapter</CODE></A> / <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> combinations.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOFeatureAnalyzer.html#org.eclipse.emf.spi.cdo"><B>CDOFeatureAnalyzer</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A call-back interface that is called by a <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOView.html" title="interface in org.eclipse.emf.cdo.view"><CODE>view</CODE></A> on each model read access.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOFetchRuleManager.html#org.eclipse.emf.spi.cdo"><B>CDOFetchRuleManager</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Collects and updates <A HREF="../../../../../org/eclipse/emf/cdo/common/util/CDOFetchRule.html" title="class in org.eclipse.emf.cdo.common.util"><CODE>fetch rules</CODE></A> for <A HREF="../../../../../org/eclipse/emf/cdo/common/revision/CDORevision.html" title="interface in org.eclipse.emf.cdo.common.revision"><CODE>revisions</CODE></A>, usually based on
+ <A HREF="../../../../../org/eclipse/emf/cdo/view/CDOFeatureAnalyzer.html" title="interface in org.eclipse.emf.cdo.view"><CODE>feature analyzer</CODE></A> statistics.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/cdo/view/class-use/CDOView.html#org.eclipse.emf.spi.cdo"><B>CDOView</B></A></B>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html
index c86fde6a9f..03c1b0cdf5 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html
@@ -107,6 +107,10 @@ Class CDOObjectImpl.CDOStoreSettingsImpl</H2>
</PRE>
<P>
+For internal use only.
+<P>
+
+<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html
index dffa2582c3..36734bb650 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/CDOObjectImpl.html
@@ -111,6 +111,10 @@ Class CDOObjectImpl</H2>
</PRE>
<P>
+The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.
+<P>
+
+<P>
<DL>
<DT><B>Author:</B></DT>
<DD>Eike Stepper</DD>
@@ -140,7 +144,7 @@ Class CDOObjectImpl</H2>
<TD><CODE><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl.CDOStoreSettingsImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;For internal use only.</TD>
</TR>
</TABLE>
&nbsp;<A NAME="nested_classes_inherited_from_class_org.eclipse.emf.ecore.impl.EStoreEObjectImpl"><!-- --></A>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html
index 6625f3cce6..b0b159ca9a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-summary.html
@@ -96,11 +96,11 @@ Exposes <A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html"
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.CDOStoreSettingsImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl.CDOStoreSettingsImpl</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>For internal use only.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-use.html
index 0815a5b956..cc0cf653dd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/internal/cdo/package-use.html
@@ -114,7 +114,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/internal/cdo/package-summary.
<TD><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/class-use/CDOObjectImpl.html#org.eclipse.emf.cdo.eresource.impl"><B>CDOObjectImpl</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -129,7 +129,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/internal/cdo/package-summary.
<TD><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/class-use/CDOObjectImpl.html#org.eclipse.emf.cdo.etypes.impl"><B>CDOObjectImpl</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
@@ -144,7 +144,7 @@ Classes in <A HREF="../../../../../org/eclipse/emf/internal/cdo/package-summary.
<TD><B><A HREF="../../../../../org/eclipse/emf/internal/cdo/class-use/CDOObjectImpl.CDOStoreSettingsImpl.html#org.eclipse.emf.internal.cdo"><B>CDOObjectImpl.CDOStoreSettingsImpl</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;For internal use only.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOStore.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOStore.html
index d0bcd8a1af..0c806d2a1a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOStore.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOStore.html
@@ -100,7 +100,9 @@ Interface CDOStore</H2>
</PRE>
<P>
-CDORevision needs to follow these rules:<br>
+A CDO specific version of an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/InternalEObject.EStore.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>InternalEObject.EStore</CODE></A>.
+ <p>
+ CDORevisions need to follow these rules:<br>
- Keep CDOID only when the object (!isNew && !isTransient) // Only when CDOID will not changed.<br>
- Keep EObject for external reference, new, transient and that until commit time.<br>
It is important since these objects could changed and we need to keep a reference to <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/EObject.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>EObject</CODE></A> until the end.
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html
index cb97288187..54623d988c 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html
@@ -97,10 +97,6 @@ Interface CDOTransactionStrategy</H2>
</PRE>
<P>
-TODO Simon: JavaDoc
-<P>
-
-<P>
<DL>
<DT><B>Since:</B></DT>
<DD>2.0</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html
index ce6d0ca66c..f7ff9dfa07 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/DefaultCDOMerger.html
@@ -329,7 +329,8 @@ Class DefaultCDOMerger</H2>
<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)</CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -415,6 +416,10 @@ public <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSetDat
<A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit">CDOChangeSet</A>&nbsp;source)
throws <A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.ConflictException.html" title="class in org.eclipse.emf.cdo.transaction">CDOMerger.ConflictException</A></PRE>
<DL>
+<DD><B>Description copied from interface: <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html#merge(org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)">CDOMerger</A></CODE></B></DD>
+<DD>Calculates the changes between a source <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change set</CODE></A> and a target <A HREF="../../../../../org/eclipse/emf/cdo/common/commit/CDOChangeSet.html" title="interface in org.eclipse.emf.cdo.common.commit"><CODE>change
+ set</CODE></A> and returns the result relative to their common ancestor.
+<P>
<DD><DL>
<DT><B>Specified by:</B><DD><CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html#merge(org.eclipse.emf.cdo.common.commit.CDOChangeSet, org.eclipse.emf.cdo.common.commit.CDOChangeSet)">merge</A></CODE> in interface <CODE><A HREF="../../../../../org/eclipse/emf/cdo/transaction/CDOMerger.html" title="interface in org.eclipse.emf.cdo.transaction">CDOMerger</A></CODE></DL>
</DD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOLoadable.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOLoadable.html
index 8a8ea3c972..287de73843 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOLoadable.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOLoadable.html
@@ -202,7 +202,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOLoadable.h
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html
index 145f8954b4..540413fd00 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/class-use/InternalCDOObject.html
@@ -231,7 +231,7 @@ Uses of <A HREF="../../../../../../org/eclipse/emf/spi/cdo/InternalCDOObject.htm
<TD><CODE><B><A HREF="../../../../../../org/eclipse/emf/internal/cdo/CDOObjectImpl.html" title="class in org.eclipse.emf.internal.cdo">CDOObjectImpl</A></B></CODE>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The base class of all <em>native</em> <A HREF="../../../../../../org/eclipse/emf/cdo/CDOObject.html" title="interface in org.eclipse.emf.cdo"><CODE>objects</CODE></A>.</TD>
</TR>
</TABLE>
&nbsp;
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
index 017df98913..92114d9ec2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-summary.html
@@ -100,12 +100,11 @@ Client service provider interfaces and useful base implementations.
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/CDOStore.html" title="interface in org.eclipse.emf.spi.cdo">CDOStore</A></B></TD>
-<TD>CDORevision needs to follow these rules:<br>
- - Keep CDOID only when the object (!</TD>
+<TD>A CDO specific version of an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/InternalEObject.EStore.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>InternalEObject.EStore</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/CDOTransactionStrategy.html" title="interface in org.eclipse.emf.spi.cdo">CDOTransactionStrategy</A></B></TD>
-<TD>TODO Simon: JavaDoc</TD>
+<TD>&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD WIDTH="15%"><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/InternalCDOLoadable.html" title="interface in org.eclipse.emf.spi.cdo">InternalCDOLoadable</A></B></TD>
diff --git a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
index 78e5689349..2bd94ab80a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
+++ b/plugins/org.eclipse.emf.cdo.doc/javadoc/org/eclipse/emf/spi/cdo/package-use.html
@@ -297,14 +297,13 @@ Classes in <A HREF="../../../../../org/eclipse/emf/spi/cdo/package-summary.html"
<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/CDOStore.html#org.eclipse.emf.spi.cdo"><B>CDOStore</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;CDORevision needs to follow these rules:<br>
- - Keep CDOID only when the object (!</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;A CDO specific version of an <A HREF="http://download.eclipse.org/modeling/emf/emf/javadoc/2.6.0/org/eclipse/emf/ecore/InternalEObject.EStore.html?is-external=true" title="class or interface in org.eclipse.emf.ecore"><CODE>InternalEObject.EStore</CODE></A>.</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/CDOTransactionStrategy.html#org.eclipse.emf.spi.cdo"><B>CDOTransactionStrategy</B></A></B>
<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;TODO Simon: JavaDoc</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
</TR>
<TR BGCOLOR="white" CLASS="TableRowColor">
<TD><B><A HREF="../../../../../org/eclipse/emf/spi/cdo/class-use/DefaultCDOMerger.html#org.eclipse.emf.spi.cdo"><B>DefaultCDOMerger</B></A></B>

Back to the top