tutorials

5 files changed, 57 insertions, 42 deletions

diff --git a/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html b/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
index 5d055ac23e..db223564b2 100644
--- a/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
+++ b/plugins/org.eclipse.emf.cdo.doc/html/connectors/CreatingTransportConnections.html
@@ -15,8 +15,8 @@
 <a name="SelectTransportType"/><p>
  Currently supported transport types are:
  <ul>
- <li><b>JVM</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/IJVMAcceptor.html" title="Interface in org.eclipse.net4j.jvm"><code>IJVMAcceptor</code></a> in the same Java Virtual Machine.
  <li><b>TCP</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/tcp/ITCPAcceptor.html" title="Interface in org.eclipse.net4j.tcp"><code>ITCPAcceptor</code></a> by means of a <a href="http://download.oracle.com/javase/1.5.0/docs/api/java/nio/channels/SocketChannel.html" title="Class in java.nio.channels"><code>SocketChannel</code></a>.
+ <li><b>JVM</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/jvm/IJVMAcceptor.html" title="Interface in org.eclipse.net4j.jvm"><code>IJVMAcceptor</code></a> in the same Java Virtual Machine.
  <li><b>SSL</b> an extension to the TCP transport that adds TLS/SSL security.
  <li><b>HTTP</b> to connect to an <a href="../../../org.eclipse.net4j.doc/javadoc/org/eclipse/net4j/http/server/IHTTPAcceptor.html" title="Interface in org.eclipse.net4j.http.server"><code>IHTTPAcceptor</code></a> that is made available by a servlet.
  </ul>
@@ -26,7 +26,9 @@
 <a name="SetupWiringContainer"/><p>
  Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec
  vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus
- ultricies mattis vel nec nunc. 
+ ultricies mattis vel nec nunc.
+ <p>
+ 
 
 <div class="snippet" style="margin-left:24px;" align="left">
   <a name="snippet_snippet1"/>
@@ -87,15 +89,17 @@
 
 </div>
 <p/>
- Lorem ipsum dolor sit amet,
- consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus lacinia dictum. Mauris non sem
- sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac est iaculis mattis. Ut eget
- massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec vulputate
- urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus ultricies mattis
- vel nec nunc. Proin venenatis tellus sit amet dui congue nec vehicula urna sollicitudin. Donec porta, risus eu
- auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at metus et dolor tincidunt convallis id
- a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac ultricies
- dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.
+
+ <p>
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus
+ lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac
+ est iaculis mattis. Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin
+ nisi vestibulum nec vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu
+ erat ac risus ultricies mattis vel nec nunc. Proin venenatis tellus sit amet dui congue nec vehicula urna
+ sollicitudin. Donec porta, risus eu auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at
+ metus et dolor tincidunt convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna.
+ Suspendisse facilisis, libero ac ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a
+ viverra metus.
 
 <h2>3 Add Configuration Parameters</h2>
 <a name="AddConfigurationParameters"/>
diff --git a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/connectors/CreatingTransportConnections.java b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/connectors/CreatingTransportConnections.java
index eacc62dbf9..e5937d71bd 100644
--- a/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/connectors/CreatingTransportConnections.java
+++ b/plugins/org.eclipse.emf.cdo.doc/src/org/eclipse/emf/cdo/doc/connectors/CreatingTransportConnections.java
@@ -65,15 +65,19 @@ public class CreatingTransportConnections
    * <p>

    * Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec

    * vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus

-   * ultricies mattis vel nec nunc. {@link Snippets#snippet1() ContainerSetup.java} Lorem ipsum dolor sit amet,

-   * consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus lacinia dictum. Mauris non sem

-   * sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac est iaculis mattis. Ut eget

-   * massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin nisi vestibulum nec vulputate

-   * urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu erat ac risus ultricies mattis

-   * vel nec nunc. Proin venenatis tellus sit amet dui congue nec vehicula urna sollicitudin. Donec porta, risus eu

-   * auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at metus et dolor tincidunt convallis id

-   * a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna. Suspendisse facilisis, libero ac ultricies

-   * dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a viverra metus.

+   * ultricies mattis vel nec nunc.

+   * <p>

+   * {@link Snippets#snippet1() ContainerSetup.java}

+   * <p>

+   * Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam eu nibh in erat dapibus accumsan. Aenean cursus

+   * lacinia dictum. Mauris non sem sapien. Vivamus sem ante, posuere a rhoncus ac, varius in nisi. Sed pulvinar urna ac

+   * est iaculis mattis. Ut eget massa felis, nec volutpat purus. In id aliquet mi. Duis euismod sapien sollicitudin

+   * nisi vestibulum nec vulputate urna euismod. Proin pulvinar ornare nunc, ac auctor elit placerat eget. Integer eu

+   * erat ac risus ultricies mattis vel nec nunc. Proin venenatis tellus sit amet dui congue nec vehicula urna

+   * sollicitudin. Donec porta, risus eu auctor semper, ante lectus lobortis sem, a luctus diam dui eu sapien. Sed at

+   * metus et dolor tincidunt convallis id a est. Donec quam nisl, scelerisque a feugiat id, mattis vel urna.

+   * Suspendisse facilisis, libero ac ultricies dictum, mi sem feugiat purus, ac aliquam metus purus sed leo. Sed a

+   * viverra metus.

    */

   public class SetupWiringContainer

   {

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
index 86c04fb8ce..1122d70d86 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/model/article.ecorediag
@@ -510,17 +510,17 @@
   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_2wb78NxPEeCpIJpgvmzkYA" type="3002" source="_RFRXINxPEeCpIJpgvmzkYA" target="_RFRXINxPEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_2wb79NxPEeCpIJpgvmzkYA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2wb79dxPEeCpIJpgvmzkYA" x="-13" y="23"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_2wb79dxPEeCpIJpgvmzkYA" x="-16" y="18"/>

     </children>

     <children xmi:type="notation:Node" xmi:id="_2wcjANxPEeCpIJpgvmzkYA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_2wcjAdxPEeCpIJpgvmzkYA" x="23" y="23"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_2wcjAdxPEeCpIJpgvmzkYA" x="25" y="18"/>

     </children>

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_2wb78dxPEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_2wb78txPEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

     <element xmi:type="ecore:EReference" href="article.ecore#//StructuralElement/children"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2wb789xPEeCpIJpgvmzkYA" points="[-19, -8, -115, -11]$[-101, -8, -197, -11]$[-101, -94, -197, -97]$[7, -94, -89, -97]$[7, -59, -89, -62]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__2dV0N5_EeCgeMAkr6dR9Q" id="(0.14388489208633093,0.5116279069767442)"/>

-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__2dV0d5_EeCgeMAkr6dR9Q" id="(0.841726618705036,0.5348837209302325)"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_2wb789xPEeCpIJpgvmzkYA" points="[-19, -9, -115, -11]$[-101, -9, -197, -11]$[-101, -81, -197, -83]$[7, -81, -89, -83]$[7, -51, -89, -53]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9clMN7nEeCn4588_wNmZw" id="(0.14388489208633093,0.5116279069767442)"/>

+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_z9clMd7nEeCn4588_wNmZw" id="(0.841726618705036,0.5348837209302325)"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_9SX-8NxPEeCpIJpgvmzkYA" type="3002" source="_RFRXINxPEeCpIJpgvmzkYA" target="_RFRXINxPEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_9SX-9NxPEeCpIJpgvmzkYA" type="4011">

@@ -532,7 +532,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_9SX-8dxPEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_9SX-8txPEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

     <element xmi:type="ecore:EReference" href="article.ecore#//StructuralElement/parent"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9SX-89xPEeCpIJpgvmzkYA" points="[-89, -62, 7, -59]$[-89, -97, 7, -94]$[-197, -97, -101, -94]$[-197, -11, -101, -8]$[-115, -11, -19, -8]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9SX-89xPEeCpIJpgvmzkYA" points="[-89, -53, 7, -51]$[-89, -83, 7, -81]$[-197, -83, -101, -81]$[-197, -11, -101, -9]$[-115, -11, -19, -9]"/>

     <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNVqYNxQEeCpIJpgvmzkYA" id="(0.841726618705036,0.5348837209302325)"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_FNVqYdxQEeCpIJpgvmzkYA" id="(0.14388489208633093,0.5116279069767442)"/>

   </edges>

@@ -546,7 +546,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_zvfBgdxREeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_zvfBgtxREeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zvfBg9xREeCpIJpgvmzkYA" points="[-8, -58, -188, 103]$[-8, -93, -188, 68]$[180, -93, 0, 68]$[180, -124, 0, 37]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zvfBg9xREeCpIJpgvmzkYA" points="[-8, -50, -188, 103]$[-8, -80, -188, 73]$[180, -80, 0, 73]$[180, -116, 0, 37]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_W2eZYNxSEeCpIJpgvmzkYA" type="3002" source="_Aoro4NxPEeCpIJpgvmzkYA" target="_VHuYkNxSEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_W2fAcNxSEeCpIJpgvmzkYA" type="4011">

@@ -598,7 +598,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_k0LYcdxUEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_k0LYctxUEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k0LYc9xUEeCpIJpgvmzkYA" points="[-1, -24, 165, 103]$[-1, -59, 165, 68]$[-166, -59, 0, 68]$[-166, -90, 0, 37]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_k0LYc9xUEeCpIJpgvmzkYA" points="[-1, -24, 165, 103]$[-1, -54, 165, 73]$[-166, -54, 0, 73]$[-166, -90, 0, 37]"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_j78TcNxVEeCpIJpgvmzkYA" type="3003" source="_x5KOgNxQEeCpIJpgvmzkYA" target="_HYp5INxVEeCpIJpgvmzkYA">

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_j78TcdxVEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

@@ -644,7 +644,7 @@
     <styles xmi:type="notation:ConnectorStyle" xmi:id="_Dth48dxaEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_Dth48txaEeCpIJpgvmzkYA" fontName="Segoe UI"/>

     <element xsi:nil="true"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Dth489xaEeCpIJpgvmzkYA" points="[0, -20, 212, 381]$[0, -279, 212, 122]$[-218, -279, -6, 122]$[-218, -311, -6, 90]"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Dth489xaEeCpIJpgvmzkYA" points="[-1, -24, 214, 385]$[-1, -282, 214, 127]$[-221, -282, -6, 127]$[-221, -332, -6, 77]"/>

     <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_DtjHENxaEeCpIJpgvmzkYA" id="(0.48201438848920863,0.23529411764705882)"/>

   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_G9qM8NxaEeCpIJpgvmzkYA" type="3003" source="_9akHENxOEeCpIJpgvmzkYA" target="_OGiwoNxZEeCpIJpgvmzkYA">

@@ -679,10 +679,10 @@
   </edges>

   <edges xmi:type="notation:Edge" xmi:id="_MrPI4NxcEeCpIJpgvmzkYA" type="3002" source="_-69sYNxaEeCpIJpgvmzkYA" target="_bhQRANxTEeCpIJpgvmzkYA">

     <children xmi:type="notation:Node" xmi:id="_MrPI5NxcEeCpIJpgvmzkYA" type="4011">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_MrPI5dxcEeCpIJpgvmzkYA" x="46" y="51"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_MrPI5dxcEeCpIJpgvmzkYA" x="59" y="51"/>

     </children>

     <children xmi:type="notation:Node" xmi:id="_MrPv8NxcEeCpIJpgvmzkYA" type="4012">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_MrPv8dxcEeCpIJpgvmzkYA" x="21" y="71"/>

+      <layoutConstraint xmi:type="notation:Location" xmi:id="_MrPv8dxcEeCpIJpgvmzkYA" x="25" y="71"/>

     </children>

     <styles xmi:type="notation:ConnectorStyle" xmi:id="_MrPI4dxcEeCpIJpgvmzkYA" routing="Rectilinear" lineColor="4210752"/>

     <styles xmi:type="notation:FontStyle" xmi:id="_MrPI4txcEeCpIJpgvmzkYA" fontColor="4210752" fontName="Segoe UI" fontHeight="10"/>

diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
index 16ae1849c0..a9da92247d 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/impl/JavaElementImpl.java
@@ -75,7 +75,7 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
     this.classDoc = classDoc;
     this.classFile = classFile;
 
-    this.documentation.getContext().register(getId(), classDoc);
+    this.documentation.getContext().register(getId(), this);
   }
 
   /**
@@ -140,7 +140,9 @@ public class JavaElementImpl extends LinkTargetImpl implements JavaElement
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (classFile: ");
diff --git a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java
index 297dd76690..415618aaf1 100644
--- a/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java
+++ b/plugins/org.eclipse.emf.cdo.releng.doc/src/org/eclipse/emf/cdo/releng/doc/article/util/ArticleUtil.java
@@ -46,14 +46,9 @@ public final class ArticleUtil
     return tags != null && tags.length != 0;
   }
 
-  public static boolean isIgnore(Doc doc)
-  {
-    return isTagged(doc, "@ignore");
-  }
-
-  public static boolean isSnippet(RootDoc root, Doc doc)
+  public static boolean isTagged(RootDoc root, Doc doc, String tag)
   {
-    boolean snippet = isTagged(doc, "@snippet");
+    boolean snippet = isTagged(doc, tag);
     if (snippet)
     {
       return true;
@@ -65,7 +60,7 @@ public final class ArticleUtil
       ClassDoc containingClass = programElementDoc.containingClass();
       if (containingClass != null)
       {
-        snippet = isSnippet(root, containingClass);
+        snippet = isTagged(root, containingClass, tag);
         if (snippet)
         {
           return true;
@@ -75,7 +70,7 @@ public final class ArticleUtil
       PackageDoc containingPackage = programElementDoc.containingPackage();
       if (containingPackage != null)
       {
-        snippet = isSnippet(root, containingPackage);
+        snippet = isTagged(root, containingPackage, tag);
         if (snippet)
         {
           return true;
@@ -88,7 +83,7 @@ public final class ArticleUtil
       PackageDoc parentPackage = getParentPackage(root, packageDoc);
       if (parentPackage != null)
       {
-        snippet = isSnippet(root, parentPackage);
+        snippet = isTagged(root, parentPackage, tag);
         if (snippet)
         {
           return true;
@@ -99,6 +94,16 @@ public final class ArticleUtil
     return false;
   }
 
+  public static boolean isIgnore(Doc doc)
+  {
+    return isTagged(doc, "@ignore");
+  }
+
+  public static boolean isSnippet(RootDoc root, Doc doc)
+  {
+    return isTagged(root, doc, "@snippet");
+  }
+
   public static boolean isFactory(MethodDoc doc)
   {
     return isTagged(doc, "@factory");