You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2016/12/16 09:04:42 UTC

svn commit: r1774561 - in /myfaces/tobago/trunk: src/site/ src/site/apt/ tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/ tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/ tob...

Author: lofwyr
Date: Fri Dec 16 09:04:42 2016
New Revision: 1774561

URL: http://svn.apache.org/viewvc?rev=1774561&view=rev
Log:
updating migration documentation

Added:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml
      - copied, changed from r1774129, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/migration20.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/migration15.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
Removed:
    myfaces/tobago/trunk/src/site/apt/migration-3.0.apt
Modified:
    myfaces/tobago/trunk/src/site/apt/demo.apt
    myfaces/tobago/trunk/src/site/apt/getting-started.apt
    myfaces/tobago/trunk/src/site/apt/new-3.0.apt
    myfaces/tobago/trunk/src/site/apt/release-checklist.apt
    myfaces/tobago/trunk/src/site/site.xml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml

Modified: myfaces/tobago/trunk/src/site/apt/demo.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/demo.apt?rev=1774561&r1=1774560&r2=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/demo.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/demo.apt Fri Dec 16 09:04:42 2016
@@ -21,11 +21,11 @@ Live Demo
 
   A live demo can be found for different versions here:
 
-  * {{{http://www.irian.biz/tobago-example-demo-3.0.x/}3.0.x (beta)}}
+  * {{{http://www.irian.biz/tobago-example-demo-3.0.x/}3.0.x (current release)}}
 
-  * {{{http://www.irian.biz/tobago-example-demo-2.0.x/}2.0.x (current release)}}
+  * {{{http://www.irian.biz/tobago-example-demo-2.0.x/}2.0.x (last release)}}
 
-  * {{{http://example.irian.at/tobago-example-demo-1.5.x/}1.5.x (last release - nightly)}}
+  * {{{http://example.irian.at/tobago-example-demo-1.5.x/}1.5.x (old release - nightly)}}
 
   * {{{http://example.irian.at/tobago-example-demo-1.0.x/}1.0.x (old release - nightly)}}
 

Modified: myfaces/tobago/trunk/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/getting-started.apt?rev=1774561&r1=1774560&r2=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/getting-started.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/getting-started.apt Fri Dec 16 09:04:42 2016
@@ -22,7 +22,7 @@
 
 Checking Out
 
-  Check out the 3.0.x sources (beta) by running the following:
+  Check out the 3.x.x sources by running the following:
 
 +----------------------------------------
   svn checkout http://svn.apache.org/repos/asf/myfaces/tobago/trunk tobago

Modified: myfaces/tobago/trunk/src/site/apt/new-3.0.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/new-3.0.apt?rev=1774561&r1=1774560&r2=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/new-3.0.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/new-3.0.apt Fri Dec 16 09:04:42 2016
@@ -14,59 +14,10 @@
  ~~ limitations under the License.
 
  ------
- What's new in Tobago 3.0 (currently beta state)?
+ What's new in Tobago 3.0?
  ------
 
-{What's new in Tobago 3.0 (currently beta state)?}
+{What's new in Tobago 3.0}
 
-    In November 2015 the first alpha version of 3.0.0 has been released, the first beta followed in December 2016.
-    Here was a quick overview over the features and changes made in the last time
-    to release this major revision.
-
-    Tobago 3.0.0 contains several entries in {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12325880}Jira}}
-    and most of them are exclusive in this version.
-
-    Please take also a look at the {{{./migration-3.0.html}Migration from Tobago 2.0 to 3.0}} guide.
-
-Overview and History
-
-    Until Tobago 2.0 the layout was computed on the server, to make advanced features available for
-    comfortable web application.
-
-    With CSS3 and HTML5 it is possible these days, to make advanced layout managers
-    implemented in the browser.
-
-New Features and Enhancements
-
-* Bootstrap
-
-    The base theme that comes with Tobago is changes from plain CSS to Twitters Bootstrap.
-    So, you applications have the advantage of modern HTML5 web applications, with
-    less coding.
-
-* New Layout Managers
-
-    * Segment Layout (uses the 12 columns layout from Bootstrap)
-
-    * Flex Layout (CSS3)
-    You may replace the <<<GridLayout>>> from Tobago 2.0 with <<<FlexLayout>>>.
-
-    * Flow Layout
-
-    * The new layout managers, have be written be bit more concised: Using as container instead of a facet.
-
-* tx library
-
-    * The tx library no longer needed
-
-    * The label is integrated into the tc library.
-
-    * This results in a more intuitive API
-
-    * Rich variations of positioning the label with new attribute labelLayout
-
-* File upload now uses Servlet 3.0 instead of Commons Fileupload. This simplifies the setup.
-
-Internal Refactoring
-
-    [todo]
+    Please refer the
+    {{{http://www.irian.biz/tobago-example-demo/faces/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml}Demo: New in Tobago 3.0}}.

Modified: myfaces/tobago/trunk/src/site/apt/release-checklist.apt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/apt/release-checklist.apt?rev=1774561&r1=1774560&r2=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/apt/release-checklist.apt (original)
+++ myfaces/tobago/trunk/src/site/apt/release-checklist.apt Fri Dec 16 09:04:42 2016
@@ -235,7 +235,7 @@ Copy the download artifacts from the rep
 set -e
 
 #VERSION=2.0.10
-VERSION=3.0.0-beta-1
+VERSION=3.0.0
 
 MAVEN_REPOSITORY=https://repository.apache.org/content/repositories/releases
 DIST_REPOSITORY=https://dist.apache.org/repos/dist/release/myfaces

Modified: myfaces/tobago/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/site.xml?rev=1774561&r1=1774560&r2=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/site.xml (original)
+++ myfaces/tobago/trunk/src/site/site.xml Fri Dec 16 09:04:42 2016
@@ -56,7 +56,7 @@
       <item name="New in Tobago 2.0" href="http://myfaces.apache.org/tobago/new-2.0.html"/>
       <item name="Guide to Tobago" href="http://myfaces.apache.org/tobago/guide.html"/>
       <item name="Test Tobago 3.0 Demo" href="http://myfaces.apache.org/tobago/howto-test.html"/>
-      <item name="Migration to 3.0 (alpha)" href="http://myfaces.apache.org/tobago/migration-3.0.html"/>
+      <item name="Migration to 3.0" href="http://www.irian.biz/tobago-example-demo/content/10-intro/50-migration/97-migration/migration30.xhtml"/>
       <item name="Migration to 2.0" href="http://myfaces.apache.org/tobago/migration-2.0.html"/>
       <item name="Migration to 1.5" href="http://myfaces.apache.org/tobago/migration-1.5.html"/>
       <item name="Roadmap" href="http://myfaces.apache.org/tobago/roadmap.html" />

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml?rev=1774561&r1=1774560&r2=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/resources/org/apache/myfaces/tobago/example/demo/Demo.xml Fri Dec 16 09:04:42 2016
@@ -36,6 +36,10 @@
   <!-- navigate -->
   <entry key="intro">Intro</entry>
   <entry key="new_in_3_0">New in Tobago 3.0</entry>
+  <entry key="migration">Migration</entry>
+  <entry key="migration15">1.0 to 1.5</entry>
+  <entry key="migration20">1.5 to 2.0</entry>
+  <entry key="migration30">2.0 to 3.0</entry>
 
   <!-- navigate : components -->
   <entry key="component">Components</entry>

Copied: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml (from r1774129, myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml?p2=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml&p1=myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml&r1=1774129&r2=1774561&rev=1774561&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/intro.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml Fri Dec 16 09:04:42 2016
@@ -21,54 +21,277 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 xmlns:tc="http://myfaces.apache.org/tobago/component"
                 xmlns:ui="http://java.sun.com/jsf/facelets">
-  <ui:param name="title" value="#{demoBundle.intro}"/>
-  <p>This is the demo of Tobago 3.
-    It shows the components and concepts of Tobago 3 and also should be a bit of a documentation.</p>
-  <p>If you want to migrate from Tobago 2.0 to 3.0, you'll find further information in the
-    <tc:link label="migration guide" link="https://myfaces.apache.org/tobago/migration-3.0.html"/>.</p>
-  <p>If you want to start this demo on you local machine, have a look at the section 'Local Demo'.</p>
-
-  <tc:section label="Description">
-    <p>Tobago is a user interface framework for developing webapplications.
-      The technical basis of the framework is JavaServer Faces. The main core represents a theme oriented
-      JSF Render Kit.</p>
-    <tc:section label="Basic Controls">
-      <p>Tobago provides all standard controls of HTML like inputs, textareas, radiobuttons, checkboxes and buttons.
-        Additionally Tobago provides you with complex controls, which are not natively supportet by simple HTML,
-        including sheets, trees and tabs.</p>
-    </tc:section>
-    <tc:section label="Validation">
-      <p>The main goal of Tobago is the development of applications which are interactive from the users point of view.
-        Tobago makes it easy to validate input and helps the user to enter correct data.</p>
-    </tc:section>
-    <tc:section label="Layout">
-      <p>Tobago provides several advanced layout managers to fit for specific use cases by using CSS3 and HTML5.
-        This includes a 12 columns layout from <tc:link label="Bootstrap" link="https://getbootstrap.com/"/>
-        and a flex layout which replace the old grid layout from Tobago2.</p>
-    </tc:section>
-    <tc:section label="Versioning">
-      <p>The Tobago project using <tc:link label="semantic versioning" link="https://semver.org/"/> since past 2016.</p>
-      <p>This will lead into more growing minor version number compared to the past.</p>
-    </tc:section>
-  </tc:section>
-
-  <tc:section label="Local Demo">
-    <p>In case that this demo already run on your local machine,
-      you can follow the link to the
-      <tc:link label="public demo" link="http://www.irian.biz/tobago-example-demo-3.0.x/"/>.</p>
-    <p>If this is the public demo and you want to build it on your own, read the following instructions.</p>
-    <tc:section label="Instructions">
-      <p>First of all you need
-        <tc:link label="maven" link="https://maven.apache.org/"/> (at least version 3.0.4) and
-        <tc:link label="Java SE 6" link="http://www.oracle.com/technetwork/java/javase/downloads/"/> or higher.</p>
-      <p>After that, check out the source code from subversion repository.
-        <br/>
-        <code>svn checkout http://svn.apache.org/repos/asf/myfaces/tobago/trunk tobago3</code>
-        <br/>
-        Alternatively you can get the source code from the
-        <tc:link label="download section" link="https://myfaces.apache.org/tobago/download.html"/>.</p>
-      <p>Go to the tobago3 directory, and build Tobago with <code>mvn install</code>.</p>
-      <p>Go to 'tobago3/tobago-example/tobago-example-demo' and start the demo with <code>mvn jetty:run</code>.</p>
+  <ui:param name="title" value="#{demoBundle.migration30}"/>
+
+  <tc:section label="Migration from Tobago 2.0 to 3.0">
+
+<p>
+  There a are several migration steps to do, dependent of the application
+  you want to migrate. The steps can be classified by
+</p>
+
+    <ul>
+      <li>Tag library</li>
+      <li>Java API</li>
+      <li>CSS</li>
+      <li>JavaScript</li>
+      <li>External components (for Java, CSS, Javascript)</li>
+    </ul>
+
+    <p>
+      Most of these steps are relatively simple to carry out.
+      Just replace "this" with "that" and so on.
+      Some of them can be done with regular expressions.
+    </p>
+
+    <tc:section label="Tag Library">
+      <tc:section label="JSP">
+        JavaServer Pages are no longer supported. You need to migrate to Facelets as VDL.
+        You may do that before migrating to Tobago 3.
+      </tc:section>
+
+      <tc:section label="Replacing tx with tc">
+        <p>
+          <code class="language-markup">&lt;tx:in label="a" fieldId="b" id="c" /&gt;</code>
+          will be transformed to
+          <code class="language-markup">&lt;tc:in label="a" id="c" /&gt;</code>.
+          The id of the input element in HTML is id="c::field".
+        </p>
+
+        <p> There is a little conflict between the "label" attribute used in the JSF spec. and the Tobago tx: label:
+          Tobago means it should be displayed, and JSF spec. means that this should be used to display messages.
+          In most cases there is no issue for that. But for the case that the application need a message label, but
+          should not be displayed we need a new attribute:
+        </p>
+
+        <p> (preliminary) "labelPosition" or "labelLayout" with value "none"
+          With this attribute we may advise the renderer also the position of the label.
+          Or, using an attribute "renderLable"...
+        </p>
+      </tc:section>
+
+      <tc:section label="&lt;tc:time&gt; -> &lt;tc:date&gt;">
+        You need to set the <code class="language-markup">&lt;f:convertDateTime type="time"\/&gt;</code>
+        inside the <code class="language-markup">&lt;tc:date/&gt;</code>.
+      </tc:section>
+
+      <tc:section label="&lt;tc:cell&gt;">
+        Replace all <code class="language-markup">&lt;tc:cell/&gt;</code>
+        with <code class="language-markup">&lt;tc:panel/&gt;</code>.
+        Dependent of the used layout manager, these tags may be dropped completely.
+      </tc:section>
+
+      <tc:section label="Layout manager no longer as facet.">
+
+        <p>
+          The layout managers are no longer a facet of a container.
+          They are in the tree hierarchy explicitly.
+        </p>
+        <p>
+          Old:
+        </p>
+        <pre><code class="language-markup">&lt;tc:panel&gt;
+  &lt;f:facet name="layout"&gt;
+    &lt;tc:flowLayout/&gt;
+  &lt;/f:facet&gt;
+  ... content ...
+&lt;/tc:panel&gt;</code></pre>
+        <p>
+          New:
+        </p>
+        <pre><code class="language-markup">&lt;tc:flowLayout&gt;
+  ... content ...
+&lt;/tc:flowLayout&gt;</code></pre>
+      </tc:section>
+      <tc:section label="&lt;tc:image&gt;">
+        <code class="language-markup">&lt;tc:image/&gt;</code>
+        has no longer the attributes <code class="language-markup">width</code>
+        and <code class="language-markup">height</code>, please use a
+        <code class="language-markup">&lt;tc:style/&gt;</code>child tag instead.
+      </tc:section>
+      <tc:section label="&lt;tc:sheet&gt;">
+        tc:column with f:facet name="dropDownBox" can now easily and much more flexible implemented with
+        the header facet of the tc:sheet. Example:
+        <tc:link label="Sheet Filter"
+                 link="#{request.contextPath}/faces/content/20-component/080-sheet/50-filter/sheet-filter.xhtml" />
+      </tc:section>
+      <tc:section label="Menu">
+        The Menu tags tc:menu, tc:menuBar, tc:menuCommand and tc:menuSeparator are no longer available and
+        needs to be migrated to tc:links or tc:bar or tc:buttons with tc:link and tc:separator inside.
+      </tc:section>
+      <tc:section label="Popup">
+        The popup was implemented new, using a general concept of collapsible in Tobago.
+        <tc:section label="&lt;tc:popupReference&gt;">
+          This tag is removed.
+        </tc:section>
+        <tc:section label="&lt;tc:popup&gt;">
+          The tc:popup tag is no longer a facet of a command. The tag can be put anywhere on the page.
+          The open/close commands now can be used flexible
+        </tc:section>
+        Example:
+        <tc:link label="popup"
+                 link="#{request.contextPath}/faces/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml" />
+      </tc:section>
+
+    </tc:section>
+
+    <tc:section label="Java API">
+      <tc:section label="ActionListenerImpl">
+        Class is no longer present, you should use a JSF 2 exception handler instead.
+      </tc:section>
+      <tc:section label="Renderer classes">
+        The API of the RendererBase class has changed a bit.
+        Also the automatic renderer selection has been dropped.
+        If you write your own renderer for existing classes, you now need to register it in
+        the faces-config.xml as ususal in JSF.
+      </tc:section>
+      <tc:section label="Typesafety">
+        <p>
+          To have typesafe code many Java classes to provide constants are migrated to Java enums,
+          e. g. <code>org.apache.myfaces.tobago.component.Attributes</code>.
+        </p>
+      </tc:section>
+
+    </tc:section>
+
+    <tc:section label="CSS">
+      <tc:section label="Bootstrap">
+        Tobago 3 uses the great <tc:link label="Bootstrap" link="http://v4-alpha.getbootstrap.com/"/> CSS library.
+        Currently in version 4.0.0-alpha.5.
+      </tc:section>
+      <tc:section label="Class names">
+        Because of the use of the Bootstrap lib, some Tobago CSS classes are no longer needed, and
+        has been
+      </tc:section>
+      <tc:section label="box-sizing">
+        Changed from content-box to border-box.
+      </tc:section>
+    </tc:section>
+
+    <tc:section label="JavaScript">
+
+    </tc:section>
+
+    <tc:section label="External components and dependencies">
+      <tc:section label="File upload">
+        <tc:section label="Servlet API 3.0">
+          Tobago 3 requires Servlet API 3.0. Tought the file upload uses
+          <code class="language-java">javax.servlet.http.Part</code>
+          instead of <code class="language-java">org.apache.commons.fileupload.FileItem</code>.
+        </tc:section>
+        <tc:section label="Filter">
+          You no long need to define a TobagoMultipartFormdataFilter in the web.xml.
+        </tc:section>
+        <tc:section label="Dependencies">
+          <p>
+            There is no longer a tobago-fileupload.jar.
+          </p>
+          <p>
+            Remove the dependency to commons-fileupload.jar in your web app, if there is any.
+          </p>
+        </tc:section>
+        <tc:section label="FacesServlet Configuration">
+          If using JSF 2.0 or 2.1 you will need to add a tag <code>&lt;multipart-config&gt;</code>
+          Tag to the FacesServlet config in the <code>web.xml</code>. Since JSF 2.2 this is not needed.
+        </tc:section>
+        Example:
+        <tc:link label="File Upload"
+                 link="#{request.contextPath}/faces/content/20-component/100-upload/upload.xhtml" />
+      </tc:section>
+
+    </tc:section>
+
+
+
+
+    <!-- todo: refactor from APT to HTML -->
+
+<pre>
+
+  <b>TODO:</b>
+
+    Because of the changed layout model (no longer on the server, but with browser CSS) there a some
+    classes, methods and parameters removed.
+
+
+    * AbstractUIPage.getActionPosition()
+
+    * AbstractUIPage.setActionPosition()
+
+    * class Box
+
+    * class Dimension
+
+    * class Position
+
+    * ClientProperties.pageWidth
+
+    * ClientProperties.pageHeight
+
+    * <code class="language-markup">&lt;tc:gridLayoutConstraint&gt;</code> -> <code class="language-markup">&lt;tc:span&gt;</code> (only for attributes columnSpan and rowSpan)
+
+    * <code class="language-markup">&lt;tc:gridLayoutConstraint&gt;</code> -> <code class="language-markup">&lt;tc:style&gt;</code> (all other attributes)
+
+    * <code class="language-markup">&lt;tc:toolBar&gt;</code> -> <code class="language-markup">&lt;tc:buttons&gt;</code>
+
+    * If using <code class="language-markup">&lt;tc:page&gt;</code> with the attributes state, width, height: remove the attributes
+
+    * Replace facet 'action' with 'load' for <code class="language-markup">&lt;tc:page&gt;</code>
+
+    <code class="language-markup">&lt;f:facet name="load"&gt;</code> contain an instance of UICommand (tc:command).
+
+    * TODO: attribute renderPartially is replaced by f:ajax
+
+    * TODO: Move data from ClientProperties to TobagoContext
+
+    <code class="language-markup">&lt;tc:mediator&gt;</code> removed
+
+    If you need a Tobago component to set e. g. some style in a renderer as a replacement,
+    use a simple <code class="language-markup">&lt;tc:panel&gt;</code>.
+
+    Tango Icons
+
+    Tango icon lib is no longer part of Tobago. Replaced by Font Awesome. If you need it, please
+    include it in the application.
+
+    Dependencies to JS/CSS libs: jQuery UI
+
+    Tobago uses the jQuery UI library. The library is customizable to limit the amount of JS and CSS content.
+    You will find the used modules in the header of each jQuery UI file.
+
+    * E. g. Tobago 2.0.10 contains jQuery UI 1.10.4 with these contents:
+
+    * jquery.ui.core.js
+
+    * jquery.ui.widget.js
+
+    * jquery.ui.mouse.js
+
+    * jquery.ui.position.js
+
+    * jquery.ui.draggable.js
+
+    * jquery.ui.datepicker.js
+
+    * jquery.ui.slider.js
+
+    * jquery.ui.core.css
+
+    * jquery.ui.datepicker.css
+
+    * jquery.ui.slider.css
+
+    * jquery.ui.theme.css
+
+    * Tobago 3.0.0 contains jQuery UI 1.12.1 with this component:
+
+    * widget.js
+
+    If you are using jQuery UI directly, you may add the required resources via the <code>&lt;tobago-config.xml</code>
+      and exclude the jQuery UI resource that comes with Tobago.
+
+</pre>
+
     </tc:section>
-  </tc:section>
-</ui:composition>
+
+  </ui:composition>

Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/migration20.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/migration20.xhtml?rev=1774561&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/migration20.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/98-migration/migration20.xhtml Fri Dec 16 09:04:42 2016
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.migration20}"/>
+
+  <tc:section label="Migration from Tobago 1.5 to 2.0">
+
+    <!-- todo -->
+    TODO: move from here: http://myfaces.apache.org/tobago/migration-2.0.html
+
+  </tc:section>
+
+</ui:composition>

Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/migration15.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/migration15.xhtml?rev=1774561&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/migration15.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/99-migration/migration15.xhtml Fri Dec 16 09:04:42 2016
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.migration15}"/>
+
+  <tc:section label="Migration from Tobago 1.0 to 1.5">
+
+    <!-- todo -->
+
+    TODO: move from here: http://myfaces.apache.org/tobago/migration-1.5.html
+
+  </tc:section>
+
+</ui:composition>

Added: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml?rev=1774561&view=auto
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml (added)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/migration.xhtml Fri Dec 16 09:04:42 2016
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+-->
+
+<ui:composition template="/main.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:tc="http://myfaces.apache.org/tobago/component"
+                xmlns:ui="http://java.sun.com/jsf/facelets">
+  <ui:param name="title" value="#{demoBundle.migration}"/>
+
+  <tc:section label="Migration of Tobago applications">
+
+    Here you can find migration guides to the major versions of Tobago.
+
+  </tc:section>
+
+</ui:composition>