[Releng] Regenerate documentation
diff --git a/plugins/org.eclipse.emf.cdo.doc/build.xml b/plugins/org.eclipse.emf.cdo.doc/build.xml
index 9203ea6..97edb62 100644
--- a/plugins/org.eclipse.emf.cdo.doc/build.xml
+++ b/plugins/org.eclipse.emf.cdo.doc/build.xml
@@ -467,6 +467,7 @@
<param name="-basefolder" value="${plugins.dir}/.." />
<param name="-project" value="org.eclipse.emf.cdo.doc" />
<param name="-externals" value="${jdk.link};${platform.link};${emf.link}" />
+ <!--param name="-modelfolder" value="/develop/MODELS" /-->
</doclet>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/operators/Doc01_ConfiguringRepositories.html b/plugins/org.eclipse.emf.cdo.doc/html/operators/Doc01_ConfiguringRepositories.html
index 8865ecf..9cfcb74 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/operators/Doc01_ConfiguringRepositories.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/operators/Doc01_ConfiguringRepositories.html
@@ -425,7 +425,7 @@
<h3><a name="Property_withRanges"></a>6.11 Property withRanges</h3>
<p>
- Specifies whether new <a href="../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevision.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>revisions</code></a> create entire new copies of all their list <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a>
+ Specifies whether new <a href="../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevision.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>revisions</code></a> create entire new copies of all their list <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a>
or whether just the list deltas are stored.
<p>
Possible configuration values are:
@@ -440,7 +440,7 @@
<h3><a name="Property_copyOnBranch"></a>6.12 Property copyOnBranch</h3>
<p>
Specifies whether <b>the first</b> new <a href="../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevision.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>revisions</code></a> in a <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> create entire new copies
- of all their list <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> or whether just the list deltas (relative to the base revisions in the parent branch) are stored.
+ of all their list <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> or whether just the list deltas (relative to the base revisions in the parent branch) are stored.
<p>
Possible configuration values are:
<ul>
@@ -453,7 +453,7 @@
<h3><a name="Property_forceZeroBasedIndex"></a>6.13 Property forceZeroBasedIndex</h3>
<p>
- Specifies whether element removals from the beginning of list <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> adjust the
+ Specifies whether element removals from the beginning of list <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> adjust the
list indexes of all following elements or whether the first element is allowed to have a non-zero list index.
<p>
Possible configuration values are:
@@ -476,7 +476,7 @@
<h2><a name="Element_dataSource"></a>8 Element dataSource</h2>
<p>
- Defines the <a href="http://download.oracle.com/javase/1.5.0/docs/api/javax/sql/DataSource.html" title="Interface in javax.sql"><code>DataSource</code></a> instance of the store.
+ Defines the <a href="http://download.oracle.com/javase/1.5.0/docs/api/javax/sql/DataSource.html" target="_blank" title="Interface in javax.sql"><code>DataSource</code></a> instance of the store.
<p>
The <code>class</code> attribute corresponds to the fully qualified name of the data source class.
Please refer to your DB manual for details about the supported data sources and their attributes.
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc01_Architecture.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc01_Architecture.html
index 194ada2..8839fc1 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc01_Architecture.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc01_Architecture.html
@@ -30,7 +30,7 @@
<p>
The architecture of a CDO application is characterized by its mandatory dependency on EMF, the Eclipse Modeling
Framework. Most of the time an application interacts with the object graph of the model through standard EMF APIs
- because CDO model graph objects are <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a>. While CDO's basic functionality integrates nicely and
+ because CDO model graph objects are <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a>. While CDO's basic functionality integrates nicely and
transparently with EMF's extension mechanisms some of the more advanced functions may require to add direct
dependencies on CDO to your application code.
<p>
@@ -68,7 +68,7 @@
<ul>
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevision.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionManager.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>manager</code></a> and <a href="../../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionCache.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>cache</code></a>,
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchManager.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>manager</code></a>,
- <li>a <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>package</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html" title="Interface in org.eclipse.emf.cdo.common.model"><code>registry</code></a>,
+ <li>a <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>package</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html" title="Interface in org.eclipse.emf.cdo.common.model"><code>registry</code></a>,
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="Interface in org.eclipse.emf.cdo.common.commit"><code>commit info</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="Interface in org.eclipse.emf.cdo.common.commit"><code>manager</code></a>,
</ul>
<p>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc03_ViewProviders.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc03_ViewProviders.html
index 12aabf5..53685ff 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc03_ViewProviders.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/client/Doc03_ViewProviders.html
@@ -79,9 +79,9 @@
<p class="author">Author: Victor Roldan Betancort</p>
<p>
A <a href="../../../javadoc/org/eclipse/emf/cdo/view/CDOViewProvider.html" title="Interface in org.eclipse.emf.cdo.view"><code>view provider</code></a> allows clients to inject custom logic into the <a href="../../../javadoc/org/eclipse/emf/cdo/eresource/CDOResourceFactory.html" title="Interface in org.eclipse.emf.cdo.eresource"><code>resource factory</code></a> mechansim, capable of handling the whole <a href="../../../javadoc/org/eclipse/emf/cdo/session/CDOSession.html" title="Interface in org.eclipse.emf.cdo.session"><code>session</code></a> and <a href="../../../javadoc/org/eclipse/emf/cdo/view/CDOView.html" title="Interface in org.eclipse.emf.cdo.view"><code>view</code></a>
- instantiation process. This permits to obtain <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/Resource.html" title="Interface in org.eclipse.emf.ecore.resource"><code>resources</code></a> through the <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html" title="Interface in org.eclipse.emf.ecore.resource"><code>resource set</code></a>
+ instantiation process. This permits to obtain <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/Resource.html" target="_blank" title="Interface in org.eclipse.emf.ecore.resource"><code>resources</code></a> through the <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html" target="_blank" title="Interface in org.eclipse.emf.ecore.resource"><code>resource set</code></a>
API transparently, without any prior CDO client API code. The view provider automatically kicks in the middle of the
- <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html#getResource(org.eclipse.emf.common.util.URI, boolean)" title="Method in org.eclipse.emf.ecore.resource.ResourceSet"><code>ResourceSet.getResource()</code></a> call, forgetting
+ <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/resource/ResourceSet.html#getResource(org.eclipse.emf.common.util.URI, boolean)" target="_blank" title="Method in org.eclipse.emf.ecore.resource.ResourceSet"><code>ResourceSet.getResource()</code></a> call, forgetting
about the whole openning session / openning transaction process, which happens behind the scenes.
<p>
This is quite useful when integrating CDO with EMF-based frameworks and tools that are not prepared for a CDO
@@ -224,10 +224,10 @@
<p>
<ul>
<li>A mandatory <b><code>class</code></b> implementing the <a href="../../../javadoc/org/eclipse/emf/cdo/view/CDOViewProvider.html" title="Interface in org.eclipse.emf.cdo.view"><code>CDOViewProvider</code></a> interface.
- <li>A mandatory <b>regular expression</b> string indicating the shape of <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/common/util/URI.html" title="Class in org.eclipse.emf.common.util"><code>URIs</code></a> that should match with the contributed provider.
+ <li>A mandatory <b>regular expression</b> string indicating the shape of <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/common/util/URI.html" target="_blank" title="Class in org.eclipse.emf.common.util"><code>URIs</code></a> that should match with the contributed provider.
<li>An optional <b><code>priority</code></b> integer value, to indicate preference over other implementations
- matching the same regular expression. A higher value indicates a higher priority, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Integer.html#MAX_VALUE" title="Field in java.lang.Integer"><code>Integer#MAX_VALUE</code></a> being
- the maximum priority value and <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Integer.html#MIN_VALUE" title="Field in java.lang.Integer"><code>Integer#MIN_VALUE</code></a> the minimum.
+ matching the same regular expression. A higher value indicates a higher priority, <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Integer.html#MAX_VALUE" target="_blank" title="Field in java.lang.Integer"><code>Integer#MAX_VALUE</code></a> being
+ the maximum priority value and <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/lang/Integer.html#MIN_VALUE" target="_blank" title="Field in java.lang.Integer"><code>Integer#MIN_VALUE</code></a> the minimum.
</ul>
<p align="right">
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/programmers/server/Architecture.html b/plugins/org.eclipse.emf.cdo.doc/html/programmers/server/Architecture.html
index 8a5a8ad..18bf65a 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/programmers/server/Architecture.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/programmers/server/Architecture.html
@@ -35,7 +35,7 @@
<p>
While technically a CDO repository depends on EMF this dependency is not of equal importance as it is in a CDO
application. In particular the generated application models are not required to be deployed to the server because a
- CDO repository accesses models reflectively and the model objects are not implemented as <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a> on
+ CDO repository accesses models reflectively and the model objects are not implemented as <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a> on
the server.
<p>
The following diagram illustrates the major building blocks of a CDO repository: <p align="center"><img src="repository-architecture.png">
@@ -61,7 +61,7 @@
<ul>
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevision.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>revision</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionManager.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>manager</code></a> and <a href="../../../javadoc/org/eclipse/emf/cdo/common/revision/CDORevisionCache.html" title="Interface in org.eclipse.emf.cdo.common.revision"><code>cache</code></a>,
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranch.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>branch</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchManager.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>manager</code></a>,
- <li>a <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>package</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html" title="Interface in org.eclipse.emf.cdo.common.model"><code>registry</code></a>,
+ <li>a <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>package</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/model/CDOPackageRegistry.html" title="Interface in org.eclipse.emf.cdo.common.model"><code>registry</code></a>,
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/CDOLock.html" title="Interface in org.eclipse.emf.cdo"><code>lock</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/server/ILockingManager.html" title="Interface in org.eclipse.emf.cdo.server"><code>manager</code></a>,
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/session/CDOSession.html" title="Interface in org.eclipse.emf.cdo.session"><code>session</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/server/ISessionManager.html" title="Interface in org.eclipse.emf.cdo.server"><code>manager</code></a>,
<li>a <a href="../../../javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfo.html" title="Interface in org.eclipse.emf.cdo.common.commit"><code>commit info</code></a> <a href="../../../javadoc/org/eclipse/emf/cdo/common/commit/CDOCommitInfoManager.html" title="Interface in org.eclipse.emf.cdo.common.commit"><code>manager</code></a>,
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html
index 70fd03c..b01ef1f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc05_UsingCheckouts.html
@@ -415,11 +415,11 @@
To update an offline checkout from remote the checkout is selected and the Update action chosen from its context menu.
The update process tries to merge all trivial conflicts they may arise. Trivial conflicts are:
<ul>
- <li> Changes to multi-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element.
- <li> Changes to different single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element.
+ <li> Changes to multi-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element.
+ <li> Changes to different single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides of the same model element.
</ul>
<p>
- If non-trivial changes are detected, i.e., changes to the same single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>feature</code></a> on both sides of the
+ If non-trivial changes are detected, i.e., changes to the same single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>feature</code></a> on both sides of the
same model element, an EMF Merge editor is opened: <p align="center"><img src="merge.png">
<p>
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc07_UsingModels.html b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc07_UsingModels.html
index b63976e..ad83cdd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc07_UsingModels.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc07_UsingModels.html
@@ -70,8 +70,8 @@
the New sub menu (see <a href="Doc07_UsingModels.html#Doc_CreatingModelElements" title="Chapter in CDO Model Repository Documentation">Creating Model Elements</a>) looks as follows: <p align="center"><img src="new-root-object.png">
<p>
- The first group of the New sub menu contains sub menus for all <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>packages</code></a> that are already used in the repository of the
- selected checkout. A package sub menu contains creation actions for all concrete <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html" title="Interface in org.eclipse.emf.ecore"><code>classes</code></a> of that package.
+ The first group of the New sub menu contains sub menus for all <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>packages</code></a> that are already used in the repository of the
+ selected checkout. A package sub menu contains creation actions for all concrete <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>classes</code></a> of that package.
<p>
The second group of the New sub menu contains the Other action, which, upon selection, will open the following dialog:
<p align="center"><img src="new-root-object-dialog.png">
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc08_Collaborating.html b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc08_Collaborating.html
index a4af631..4bcf02f 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc08_Collaborating.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc08_Collaborating.html
@@ -89,13 +89,13 @@
Each time a local transaction is notified of a remote change by the CDO server and local conflicts are detected (see <a href="Doc08_Collaborating.html#Doc_EarlyConflictDetection" title="Chapter in CDO Model Repository Documentation">Early Conflict Detection</a>)
these conflicts are categorized as being either <i>trivial</i> conflicts or <i>non-trivial</i> conflicts. Trivial conflicts are:
<ul>
- <li> Changes to multi-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides (local and remote) of the same model element.
- <li> Changes to different single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides (local and remote) of the same model element.
+ <li> Changes to multi-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides (local and remote) of the same model element.
+ <li> Changes to different single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>features</code></a> on both sides (local and remote) of the same model element.
</ul>
<p>
Trivial conflicts are merged automatically into the local transaction, i.e., no user interaction is involved.
<p>
- When non-trivial changes are detected, i.e., changes to the same single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" title="Interface in org.eclipse.emf.ecore"><code>feature</code></a> on both sides (local and remote)
+ When non-trivial changes are detected, i.e., changes to the same single-valued <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EStructuralFeature.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>feature</code></a> on both sides (local and remote)
of the same model element, automatic conflict resolution is suspended for all model elements until the next local commit operation.
During this period all incoming change notifications are accumulated and remembered for possible <a href="Doc08_Collaborating.html#Doc_InteractiveConflictResolution" title="Chapter in CDO Model Repository Documentation">Interactive Conflict Resolution</a>
at commit time.
diff --git a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc09_TechnicalBackground.html b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc09_TechnicalBackground.html
index 6b9acd7..da950e2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/users/Doc09_TechnicalBackground.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/users/Doc09_TechnicalBackground.html
@@ -51,13 +51,13 @@
<h2><a name="Doc_BackgroundModelElements"></a>1 Technical Background of Model Elements</h2>
<p>
- Model elements are <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a>.
+ Model elements are <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a>.
<p>
- EObjects are instances of concrete <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html" title="Interface in org.eclipse.emf.ecore"><code>EClasses</code></a>, sometimes referred to as model element types.
+ EObjects are instances of concrete <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EClasses</code></a>, sometimes referred to as model element types.
<p>
- EClasses are contained by <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>EPackages</code></a>, often referred to as meta models and sometimes less specifically as just models.
+ EClasses are contained by <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EPackages</code></a>, often referred to as meta models and sometimes less specifically as just models.
<p>
- EPackages are registered in the <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.Registry.html" title="Interface in org.eclipse.emf.ecore.EPackage"><code>EPackage.Registry</code></a>.<p><b>See Also:</b></p>
+ EPackages are registered in the <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.Registry.html" target="_blank" title="Interface in org.eclipse.emf.ecore.EPackage"><code>EPackage.Registry</code></a>.<p><b>See Also:</b></p>
<ul>
<li><a href="http://help.eclipse.org/mars/nav/21" title="Article in CDO Model Repository Documentation">EMF Developer Guide</a></li>
</ul>
@@ -65,7 +65,7 @@
<h3><a name="Doc_BackgroundNativeModels"></a>1.1 Native Models</h3>
<p>
- The term "native model" refers to an <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>EPackage</code></a> that is <a href="../programmers/client/Doc02_PreparingModels.html#Doc_GeneratingModel" title="Chapter in CDO Model Repository Documentation">generated</a>
+ The term "native model" refers to an <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EPackage</code></a> that is <a href="../programmers/client/Doc02_PreparingModels.html#Doc_GeneratingModel" title="Chapter in CDO Model Repository Documentation">generated</a>
with some CDO-specific <a href="../programmers/client/Doc02_PreparingModels.html#Doc_MigratingManually" title="Chapter in CDO Model Repository Documentation">options</a> to fully exploit CDO's unprecedented
characteristics with respect to scalability and performance.
<p>
@@ -83,7 +83,7 @@
<h3><a name="Doc_BackgroundLegacyModels"></a>1.2 Legacy Models</h3>
<p>
- Generating or regenerating an <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>EPackage</code></a> with the CDO-specific <a href="../programmers/client/Doc02_PreparingModels.html#Doc_MigratingManually" title="Chapter in CDO Model Repository Documentation">options</a>
+ Generating or regenerating an <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EPackage</code></a> with the CDO-specific <a href="../programmers/client/Doc02_PreparingModels.html#Doc_MigratingManually" title="Chapter in CDO Model Repository Documentation">options</a>
(as explained in <a href="Doc09_TechnicalBackground.html#Doc_BackgroundNativeModels" title="Chapter in CDO Model Repository Documentation">Native Models</a>) is not always possible, for example if an EPackage has already
been generated by a third party. In these cases the original generated EPackage can still be used with CDO;
and is then referred to as a "legacy model".
@@ -94,7 +94,7 @@
<h3><a name="Doc_BackgroundDynamicModels"></a>1.3 Dynamic Models</h3>
<p>
- It is not strictly necessary for an <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" title="Interface in org.eclipse.emf.ecore"><code>EPackage</code></a> to be generated into Java code to be used with CDO.
+ It is not strictly necessary for an <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EPackage.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EPackage</code></a> to be generated into Java code to be used with CDO.
An EPackage can also be loaded dynamically at runtime (see <a href="../programmers/client/Doc02_PreparingModels.html#Doc_CreatingEcore" title="Chapter in CDO Model Repository Documentation">Creating an Ecore Model</a> for an example of the
XML representation of an EPackage).
<p>
@@ -195,8 +195,8 @@
and remote database queries to determine and deliver the <a href="../../javadoc/org/eclipse/emf/cdo/common/id/CDOID.html" title="Interface in org.eclipse.emf.cdo.common.id"><code>object IDs</code></a> that are involved in all changes
between two different <a href="../../javadoc/org/eclipse/emf/cdo/common/branch/CDOBranchPoint.html" title="Interface in org.eclipse.emf.cdo.common.branch"><code>CDOBranchPoints</code></a>. The response times depend on the implementation of the <a href="../../javadoc/org/eclipse/emf/cdo/server/IStore.html" title="Interface in org.eclipse.emf.cdo.server"><code>backend storage</code></a>.
The response time of the default implementation, the DBStore, scales more
- with the sizes of the stored meta models (i.e., the number of concrete <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html" title="Interface in org.eclipse.emf.ecore"><code>EClasses</code></a>) than with the sizes of the stored models
- (i.e., the number of <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a>).
+ with the sizes of the stored meta models (i.e., the number of concrete <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EClass.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EClasses</code></a>) than with the sizes of the stored models
+ (i.e., the number of <a href="http://download.eclipse.org/modeling/emf/emf/javadoc/2.9.0/org/eclipse/emf/ecore/EObject.html" target="_blank" title="Interface in org.eclipse.emf.ecore"><code>EObjects</code></a>).
<p align="right">
<a href="Doc08_Collaborating.html" title="Backward to Collaborating in Real-Time"><img src="../../images/backward.png" border="0"></a> <a href="../operators/index.html" title="Forward to Operator's Guide"><img src="../../images/forward.png" border="0"></a></p>
diff --git a/plugins/org.eclipse.emf.cdo.releng.help/html/usage.html b/plugins/org.eclipse.emf.cdo.releng.help/html/usage.html
index d52e154..3af68dd 100644
--- a/plugins/org.eclipse.emf.cdo.releng.help/html/usage.html
+++ b/plugins/org.eclipse.emf.cdo.releng.help/html/usage.html
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using the CDO help center</title>
+<title>Using the Oomph help center</title>
<link rel="stylesheet" href="usage.css">
</head>
@@ -14,7 +14,7 @@
</div>
<div id="content">
- <h1>Using the CDO Help Center</h1>
+ <h1>Using the Oomph Help Center</h1>
<p>
Browse topics in the left frame <span class="icon">(<img class="icon" src="plus.gif" alt="Plus icon">)</span>.
diff --git a/plugins/org.eclipse.net4j.db.doc/build.xml b/plugins/org.eclipse.net4j.db.doc/build.xml
index d1ab9c6..c27b0a0 100644
--- a/plugins/org.eclipse.net4j.db.doc/build.xml
+++ b/plugins/org.eclipse.net4j.db.doc/build.xml
@@ -271,6 +271,7 @@
<param name="-basefolder" value="${plugins.dir}/.." />
<param name="-project" value="org.eclipse.net4j.db.doc" />
<param name="-externals" value="${jdk.link};${platform.link};${emf.link}" />
+ <!--param name="-modelfolder" value="/develop/MODELS" /-->
</doclet>
diff --git a/plugins/org.eclipse.net4j.doc/build.xml b/plugins/org.eclipse.net4j.doc/build.xml
index 00eb129..1552ee4 100644
--- a/plugins/org.eclipse.net4j.doc/build.xml
+++ b/plugins/org.eclipse.net4j.doc/build.xml
@@ -285,6 +285,7 @@
<param name="-basefolder" value="${plugins.dir}/.." />
<param name="-project" value="org.eclipse.net4j.doc" />
<param name="-externals" value="${jdk.link};${platform.link};${emf.link}" />
+ <!--param name="-modelfolder" value="/develop/MODELS" /-->
</doclet>
diff --git a/plugins/org.eclipse.net4j.util.doc/build.xml b/plugins/org.eclipse.net4j.util.doc/build.xml
index 1f2a3fd..7be1128 100644
--- a/plugins/org.eclipse.net4j.util.doc/build.xml
+++ b/plugins/org.eclipse.net4j.util.doc/build.xml
@@ -304,6 +304,7 @@
<param name="-basefolder" value="${plugins.dir}/.." />
<param name="-project" value="org.eclipse.net4j.util.doc" />
<param name="-externals" value="${jdk.link};${platform.link};${emf.link}" />
+ <!--param name="-modelfolder" value="/develop/MODELS" /-->
</doclet>
