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 2017/01/25 11:09:53 UTC

svn commit: r1780172 - in /myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content: 10-intro/ 10-intro/30-new+in+3+0/ 10-intro/40-new+in+2+0/ 10-intro/50-migration/97-migration/ 20-component/060-popup/

Author: lofwyr
Date: Wed Jan 25 11:09:53 2017
New Revision: 1780172

URL: http://svn.apache.org/viewvc?rev=1780172&view=rev
Log:
fix in demo: link attribute must not contain the contextPath

Modified:
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml
    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/20-component/060-popup/popup.xhtml

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new%2Bin%2B3%2B0/new%2Bin%2B3%2B0.xhtml?rev=1780172&r1=1780171&r2=1780172&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/30-new+in+3+0/new+in+3+0.xhtml Wed Jan 25 11:09:53 2017
@@ -30,7 +30,7 @@
              link="http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12325880"/>
     and most of them are exclusive in this version.</p>
   <p>Please take also a look at the <tc:link label="Migration from Tobago 2.0 to 3.0"
-                                             link="#{request.contextPath}/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/> guide.</p>
+                                             link="/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/> guide.</p>
 
   <tc:section label="Overview and History">
     <p>Until Tobago 2.0 the layout was computed on the server, to make advanced features available for comfortable web
@@ -62,43 +62,43 @@
     <b>New tags</b>
     <ul>
       <li><tc:link label="&lt;tc:section>"
-                   link="#{request.contextPath}/faces/content/20-component/050-container/40-section/section.xhtml"/>
+                   link="/faces/content/20-component/050-container/40-section/section.xhtml"/>
       </li>
       <li><tc:link label="&lt;tc:header> &amp; &lt;tc:footer>"
-                   link="#{request.contextPath}/faces/content/20-component/050-container/50-header+footer/header+footer.xhtml"/>
+                   link="/faces/content/20-component/050-container/50-header+footer/header+footer.xhtml"/>
       </li>
       <li><tc:link label="&lt;tc:figure>"
-                   link="#{request.contextPath}/faces/content/20-component/020-output/45-figure/figure.xhtml"/></li>
+                   link="/faces/content/20-component/020-output/45-figure/figure.xhtml"/></li>
     </ul>
 
     <b>Improved tags</b>
     <ul>
       <li>The <code class="language-markup">&lt;tc:in/></code> tag may be extended to an
         <tc:link label="#{demoBundle.group}"
-                 link="#{request.contextPath}/faces/content/20-component/010-input/50-input-group/group.xhtml"/>.
+                 link="/faces/content/20-component/010-input/50-input-group/group.xhtml"/>.
       </li>
       <li>A <code>size</code> attribute is added for
         <ul>
           <li><tc:link label="&lt;tc:selectOneListbox>"
-                       link="#{request.contextPath}/faces/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml"/>,
+                       link="/faces/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml"/>,
           </li>
           <li><tc:link label="&lt;tc:selectManyListbox>"
-                       link="#{request.contextPath}/faces/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml"/>,
+                       link="/faces/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml"/>,
           </li>
           <li><tc:link label="&lt;tc:selectManyShuffle>"
-                       link="#{request.contextPath}/faces/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml"/> and
+                       link="/faces/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml"/> and
           </li>
           <li><tc:link label="&lt;tc:treeListbox>"
-                       link="#{request.contextPath}/faces/content/20-component/090-tree/04-listbox/tree-listbox.xhtml"/>.
+                       link="/faces/content/20-component/090-tree/04-listbox/tree-listbox.xhtml"/>.
           </li>
         </ul>
       </li>
       <li>Only <code>disabled="true"</code> must be set to disable an
         <tc:link label="image"
-                 link="#{request.contextPath}/faces/content/20-component/020-output/40-image/image.xhtml"/>.
+                 link="/faces/content/20-component/020-output/40-image/image.xhtml"/>.
       </li>
       <li><tc:link label="&lt;tc:sheet>"
-                   link="#{request.contextPath}/faces/content/20-component/080-sheet/sheet.xhtml"/>
+                   link="/faces/content/20-component/080-sheet/sheet.xhtml"/>
         <ul>
           <li>Constraints are no londer needed to set a multi-line header.</li>
           <li>A width can be defined for columns which will influence the auto layout of the browser.</li>
@@ -116,7 +116,7 @@
     <b>Collapsible concept</b>
     <p>There is a new
       <tc:link label="collapsible concept"
-               link="#{request.contextPath}/faces/content/30-concept/53-collapsible/collapsible.xhtml"/>
+               link="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/>
       for <code class="language-markup">&lt;tc:box></code>, <code class="language-markup">&lt;tc:section></code>,
       <code class="language-markup">&lt;tc:panel></code> and <code class="language-markup">&lt;tc:popup></code>
       where the collapse state can be switched via an <code class="language-markup">&lt;tc:operation></code>.
@@ -131,14 +131,14 @@
       <li>ResourceBundles support parameters</li>
       <li>The <code>lang</code> attribute of the HTML root tag will be rendered now.</li>
       <li><tc:link label="#{demoBundle.messages}"
-                   link="#{request.contextPath}/faces/content/20-component/020-output/30-messages/messages.xhtml"/>
+                   link="/faces/content/20-component/020-output/30-messages/messages.xhtml"/>
         are closeable now.
       </li>
       <li>Custom CSS classes can be added to a component.</li>
       <li>Support more units than 'px'. Now ex, em, mm, cm, in can be used as well.</li>
       <li>The <code>link</code> attribute of
         <tc:link label="&lt;tc:link> &amp; &lt;tc:button>"
-                 link="#{request.contextPath}/faces/content/20-component/040-command/00-button+link/button+link.xhtml"/>
+                 link="/faces/content/20-component/040-command/00-button+link/button+link.xhtml"/>
         does support rightClick -&gt; newTab.
       </li>
     </ul>
@@ -151,7 +151,7 @@
       <li>JSP support removed.</li>
       <li>The tag <code lang="language-markup">&lt;tc:time></code> is removed. Use
         <tc:link label="&lt;tc:date>"
-                 link="#{request.contextPath}/faces/content/20-component/010-input/40-date/date.xhtml"/> instead.
+                 link="/faces/content/20-component/010-input/40-date/date.xhtml"/> instead.
       </li>
     </ul>
   </tc:section>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new%2Bin%2B2%2B0/new%2Bin%2B2%2B0.xhtml?rev=1780172&r1=1780171&r2=1780172&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/40-new+in+2+0/new+in+2+0.xhtml Wed Jan 25 11:09:53 2017
@@ -30,7 +30,7 @@
     and most of them are exclusive in this version.</p>
   <p>Please take also a look at the
     <tc:link label="Migration from Tobago 1.5 to 2.0"
-             link="#{request.contextPath}/faces/content/10-intro/50-migration/98-migration/migration20.xhtml?dswid=-2767"/>
+             link="/faces/content/10-intro/50-migration/98-migration/migration20.xhtml"/>
     guide.</p>
   <tc:section label="Enhancements">
     <b>Date- and Time-Picker</b>

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.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?rev=1780172&r1=1780171&r2=1780172&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/97-migration/migration30.xhtml Wed Jan 25 11:09:53 2017
@@ -113,7 +113,7 @@
         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" />
+                 link="/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
@@ -130,7 +130,7 @@
         </tc:section>
         Example:
         <tc:link label="popup"
-                 link="#{request.contextPath}/faces/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml" />
+                 link="/faces/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml" />
       </tc:section>
 
     </tc:section>
@@ -196,7 +196,7 @@
         </tc:section>
         Example:
         <tc:link label="File Upload"
-                 link="#{request.contextPath}/faces/content/20-component/100-upload/upload.xhtml" />
+                 link="/faces/content/20-component/100-upload/upload.xhtml" />
       </tc:section>
 
     </tc:section>

Modified: 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/intro.xhtml?rev=1780172&r1=1780171&r2=1780172&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/intro.xhtml Wed Jan 25 11:09:53 2017
@@ -25,7 +25,7 @@
   <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="#{request.contextPath}/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/>.</p>
+    <tc:link label="migration guide" link="/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/>.</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">

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml?rev=1780172&r1=1780171&r2=1780172&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml Wed Jan 25 11:09:53 2017
@@ -27,7 +27,7 @@
     It can be filled with other components.</p>
   <p>The popup dialog is based on the
     <tc:link label="#{demoBundle.collapsible}"
-             link="#{request.contextPath}/faces/content/30-concept/53-collapsible/collapsible.xhtml"/> concept.</p>
+             link="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/> concept.</p>
   <p>Tag Library Documentation:
     <tc:link label="&lt;tc:popup/>" image="#{request.contextPath}/image/feather-leaf.png"
              link="#{demoBundle.tagDocUrl}/#{info.stableVersion}/tld/tc/popup.html"/>