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/06/14 12:06:49 UTC
svn commit: r1798669 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src:
main/java/org/apache/myfaces/tobago/example/demo/ main/webapp/
main/webapp/WEB-INF/ main/webapp/content/10-intro/
main/webapp/content/10-intro/30-new+in+3+0/ main/w...
Author: lofwyr
Date: Wed Jun 14 12:06:49 2017
New Revision: 1798669
URL: http://svn.apache.org/viewvc?rev=1798669&view=rev
Log:
removing prefix "/faces", because ist no longer needed and makes the application simpler. E.g. Securing direct calls of *.xhtml is no longer needed.
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestExceptionHandler.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
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/96-migration/migration40.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/040-command/00-button+link/button+link.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/060-popup/popup.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/sheet-static-header.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/collapsible.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/non-faces-request.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/index.html
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Login.java Wed Jun 14 12:06:49 2017
@@ -51,7 +51,7 @@ public class Login {
LOG.info("Successful login user: '{}'", username);
response.sendRedirect(response.encodeRedirectURL(
- request.getContextPath() + "/faces/content/30-concept/80-security/20-roles/roles.xhtml"));
+ request.getContextPath() + "/content/30-concept/80-security/20-roles/roles.xhtml"));
}
public void logout() throws ServletException, IOException {
@@ -62,7 +62,7 @@ public class Login {
request.logout();
response.sendRedirect(response.encodeRedirectURL(
- request.getContextPath() + "/faces/content/30-concept/80-security/20-roles/roles.xhtml"));
+ request.getContextPath() + "/content/30-concept/80-security/20-roles/roles.xhtml"));
}
public String resetSession() throws IOException {
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PrettyUrlForMenuNavigationHandler.java Wed Jun 14 12:06:49 2017
@@ -48,7 +48,7 @@ public class PrettyUrlForMenuNavigationH
final ExternalContext externalContext = facesContext.getExternalContext();
try {
externalContext.redirect(
- externalContext.encodeRedirectURL(externalContext.getRequestContextPath() + "/faces" + outcome,
+ externalContext.encodeRedirectURL(externalContext.getRequestContextPath() + outcome,
Collections.<String, List<String>>emptyMap()));
} catch (final IOException e) {
// not nice?
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestExceptionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestExceptionHandler.java?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestExceptionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TestExceptionHandler.java Wed Jun 14 12:06:49 2017
@@ -64,7 +64,7 @@ public class TestExceptionHandler extend
* TODO analyse the '/faces'-prefix
* actually the viewID should be enough, but if you do so, the FacesMessage won't be shown.
*/
- nav.handleNavigation(facesContext, null, "/faces" + ((ViewExpiredException) cause).getViewId());
+ nav.handleNavigation(facesContext, null, ((ViewExpiredException) cause).getViewId());
facesContext.renderResponse();
} finally {
iterator.remove();
@@ -74,7 +74,7 @@ public class TestExceptionHandler extend
try {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final NavigationHandler nav = facesContext.getApplication().getNavigationHandler();
- nav.handleNavigation(facesContext, null, "/faces/error/404.xhtml");
+ nav.handleNavigation(facesContext, null, "/error/404.xhtml");
facesContext.getExternalContext().setResponseStatus(HttpServletResponse.SC_NOT_FOUND);
facesContext.renderResponse();
} finally {
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml Wed Jun 14 12:06:49 2017
@@ -129,7 +129,7 @@
<servlet-mapping>
<servlet-name>FacesServlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
+ <url-pattern>*.xhtml</url-pattern>
</servlet-mapping>
<!-- Error handling, see also these classes:
@@ -139,22 +139,22 @@
<error-page>
<error-code>404</error-code>
- <location>/faces/error/404.xhtml</location>
+ <location>/error/404.xhtml</location>
</error-page>
<error-page>
<error-code>500</error-code>
- <location>/faces/error/exception.xhtml</location>
+ <location>/error/exception.xhtml</location>
</error-page>
<error-page>
<exception-type>java.lang.Exception</exception-type>
- <location>/faces/error/exception.xhtml</location>
+ <location>/error/exception.xhtml</location>
</error-page>
<!-- The Usual Welcome File List -->
<welcome-file-list>
- <welcome-file>index.html</welcome-file>
+ <welcome-file>init.xhtml</welcome-file>
</welcome-file-list>
<session-config>
@@ -167,7 +167,6 @@
<display-name>Security Constraint</display-name>
<web-resource-collection>
<web-resource-name>Application Area</web-resource-name>
- <url-pattern>/faces/content/30-concept/80-security/20-roles/*</url-pattern>
<url-pattern>/content/30-concept/80-security/20-roles/*</url-pattern>
</web-resource-collection>
<auth-constraint>
@@ -180,8 +179,8 @@
<auth-method>FORM</auth-method>
<realm-name>demo-realm</realm-name>
<form-login-config>
- <form-login-page>/faces/login.xhtml</form-login-page>
- <form-error-page>/faces/login.xhtml</form-error-page>
+ <form-login-page>/login.xhtml</form-login-page>
+ <form-error-page>/login.xhtml</form-error-page>
</form-login-config>
</login-config>
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=1798669&r1=1798668&r2=1798669&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 Jun 14 12:06:49 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="/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/> guide.</p>
+ link="/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="<tc:section>"
- link="/faces/content/20-component/050-container/40-section/section.xhtml"/>
+ link="/content/20-component/050-container/40-section/section.xhtml"/>
</li>
<li><tc:link label="<tc:header> & <tc:footer>"
- link="/faces/content/20-component/050-container/50-header+footer/header+footer.xhtml"/>
+ link="/content/20-component/050-container/50-header+footer/header+footer.xhtml"/>
</li>
<li><tc:link label="<tc:figure>"
- link="/faces/content/20-component/020-output/45-figure/figure.xhtml"/></li>
+ link="/content/20-component/020-output/45-figure/figure.xhtml"/></li>
</ul>
<b>Improved tags</b>
<ul>
<li>The <code class="language-markup"><tc:in/></code> tag may be extended to an
<tc:link label="#{demoBundle.group}"
- link="/faces/content/20-component/010-input/50-input-group/group.xhtml"/>.
+ link="/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="<tc:selectOneListbox>"
- link="/faces/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml"/>,
+ link="/content/20-component/030-select/40-selectOneListbox/selectOneListbox.xhtml"/>,
</li>
<li><tc:link label="<tc:selectManyListbox>"
- link="/faces/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml"/>,
+ link="/content/20-component/030-select/60-selectManyListbox/selectManyListbox.xhtml"/>,
</li>
<li><tc:link label="<tc:selectManyShuffle>"
- link="/faces/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml"/> and
+ link="/content/20-component/030-select/70-selectManyShuttle/selectManyShuttle.xhtml"/> and
</li>
<li><tc:link label="<tc:treeListbox>"
- link="/faces/content/20-component/090-tree/04-listbox/tree-listbox.xhtml"/>.
+ link="/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="/faces/content/20-component/020-output/40-image/image.xhtml"/>.
+ link="/content/20-component/020-output/40-image/image.xhtml"/>.
</li>
<li><tc:link label="<tc:sheet>"
- link="/faces/content/20-component/080-sheet/sheet.xhtml"/>
+ link="/content/20-component/080-sheet/sheet.xhtml"/>
<ul>
<li>Constraints are no longer 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="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/>
+ link="/content/30-concept/53-collapsible/collapsible.xhtml"/>
for <code class="language-markup"><tc:box></code>, <code class="language-markup"><tc:section></code>,
<code class="language-markup"><tc:panel></code> and <code class="language-markup"><tc:popup></code>
where the collapse state can be switched via an <code class="language-markup"><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="/faces/content/20-component/020-output/30-messages/messages.xhtml"/>
+ link="/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="<tc:link> & <tc:button>"
- link="/faces/content/20-component/040-command/00-button+link/button+link.xhtml"/>
+ link="/content/20-component/040-command/00-button+link/button+link.xhtml"/>
does support rightClick -> newTab.
</li>
</ul>
@@ -151,7 +151,7 @@
<li>JSP support removed.</li>
<li>The tag <code lang="language-markup"><tc:time></code> is removed. Use
<tc:link label="<tc:date>"
- link="/faces/content/20-component/010-input/40-date/date.xhtml"/> instead.
+ link="/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=1798669&r1=1798668&r2=1798669&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 Jun 14 12:06:49 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="/faces/content/10-intro/50-migration/98-migration/migration20.xhtml"/>
+ link="/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/96-migration/migration40.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/migration40.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/migration40.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/50-migration/96-migration/migration40.xhtml Wed Jun 14 12:06:49 2017
@@ -59,7 +59,7 @@
</f:facet>
</tc:bar></code></pre>
<p>For more information have a look at
- <tc:link label="tc:bar" link="/faces/content/20-component/050-container/60-bar/bar.xhtml"/></p>
+ <tc:link label="tc:bar" link="/content/20-component/050-container/60-bar/bar.xhtml"/></p>
</tc:section>
</tc:section>
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=1798669&r1=1798668&r2=1798669&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 Jun 14 12:06:49 2017
@@ -112,7 +112,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="/faces/content/20-component/080-sheet/50-filter/sheet-filter.xhtml" />
+ link="/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
@@ -129,7 +129,7 @@
</tc:section>
Example:
<tc:link label="popup"
- link="/faces/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml" />
+ link="/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml" />
</tc:section>
<tc:section label="facets">
<tc:section label="action">
@@ -204,7 +204,7 @@
</tc:section>
Example:
<tc:link label="File Upload"
- link="/faces/content/20-component/100-upload/upload.xhtml" />
+ link="/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=1798669&r1=1798668&r2=1798669&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 Jun 14 12:06:49 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="/faces/content/10-intro/50-migration/97-migration/migration30.xhtml"/>.</p>
+ <tc:link label="migration guide" link="/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/040-command/00-button+link/button+link.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button%2Blink/button%2Blink.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button+link/button+link.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/040-command/00-button+link/button+link.xhtml Wed Jun 14 12:06:49 2017
@@ -141,7 +141,7 @@
<tc:section label="IFrame">
<p>The iframe is set with <code class="language-markup"><tc:object name="objectframe" .../></code>
(see <tc:link label="#{demoBundle.object}"
- link="/faces/content/20-component/020-output/60-object/object.xhtml"/>).
+ link="/content/20-component/020-output/60-object/object.xhtml"/>).
The value of the <code>target</code> attribute is in this case 'objectframe'.</p>
<p><tc:link label="apache.org" link="https://www.apache.org/" target="objectframe"/>
|
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/050-container/10-box/box.xhtml Wed Jun 14 12:06:49 2017
@@ -47,9 +47,9 @@
To define the behavior of hidden content, use the <code>collapseMode</code> attribute.
For more information have a look at the
<tc:link label="#{demoBundle.collapsible_box}"
- link="/faces/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml"/> page
+ link="/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml"/> page
in the <tc:link label="#{demoBundle.collapsible}"
- link="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/> section.</p>
+ link="/content/30-concept/53-collapsible/collapsible.xhtml"/> section.</p>
</tc:section>
<tc:section label="Bar">
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=1798669&r1=1798668&r2=1798669&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 Jun 14 12:06:49 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="/faces/content/30-concept/53-collapsible/collapsible.xhtml"/> concept.</p>
+ link="/content/30-concept/53-collapsible/collapsible.xhtml"/> concept.</p>
<p>Tag Library Documentation:
<tc:link label="<tc:popup/>" image="#{request.contextPath}/image/feather-leaf.png"
link="#{demoBundle.tagDocUrl}/#{info.stableVersion}/tld/tc/popup.html"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/sheet-static-header.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/sheet-static-header.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/sheet-static-header.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/55-staticheader/sheet-static-header.xhtml Wed Jun 14 12:06:49 2017
@@ -27,7 +27,7 @@
<code class="language-markup"><tc:column></code>.
For more complex header which span over columns and/or rows please go to the
<tc:link label="#{demoBundle.sheet_multi_header}"
- link="/faces/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml"/> section.</p>
+ link="/content/20-component/080-sheet/60-multiheader/sheet-multi-header.xhtml"/> section.</p>
<p>Tag Library Documentation:
<tc:link label="<tc:sheet/>" image="#{request.contextPath}/image/feather-leaf.png"
link="#{demoBundle.tagDocUrl}/#{info.stableVersion}/tld/tc/sheet.html"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/06-validation/validation.xhtml Wed Jun 14 12:06:49 2017
@@ -29,5 +29,5 @@
The <code class="language-markup"><tc:messages/></code> tag provide different severity levels.
Have a look at
<tc:link label="#{demoBundle.messages}"
- link="/faces/content/20-component/020-output/30-messages/messages.xhtml"/>.</p>
+ link="/content/20-component/020-output/30-messages/messages.xhtml"/>.</p>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/08-form/form.xhtml Wed Jun 14 12:06:49 2017
@@ -27,7 +27,7 @@
Forms are added by the <code class="language-markup"><tc:form/></code> tag.</p>
<p>Forms are also relevant for
<tc:link label="#{demoBundle.default_command}"
- link="/faces/content/20-component/040-command/00-default/default-command.xhtml"/>.</p>
+ link="/content/20-component/040-command/00-default/default-command.xhtml"/>.</p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
link="#{demoBundle.tagDocUrl}/#{info.stableVersion}/tld/tc/form.html"/>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/16-layout/50-grid/grid-layout.xhtml Wed Jun 14 12:06:49 2017
@@ -24,7 +24,7 @@
<ui:param name="title" value="#{demoBundle.grid_layout} (deprecated)"/>
<p>The GridLayout is deprecated. Take a look at
<tc:link label="#{demoBundle.grid_layout}"
- link="/faces/content/35-deprecated/70-grid-layout/grid-layout.xhtml"/>
+ link="/content/35-deprecated/70-grid-layout/grid-layout.xhtml"/>
in the #{demoBundle.deprecated} section.
</p>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/00-collapsible-box/collapsible-box.xhtml Wed Jun 14 12:06:49 2017
@@ -24,7 +24,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="#{demoBundle.collapsible_box} <tc:box>"/>
<p>On this page the collapsible concept is explained for a
- <tc:link label="#{demoBundle.box}" link="/faces/content/20-component/050-container/10-box/box.xhtml"/>.</p>
+ <tc:link label="#{demoBundle.box}" link="/content/20-component/050-container/10-box/box.xhtml"/>.</p>
<tc:section label="Simple Collapsible Box">
<tc:form id="controller">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/10-collapsible-popup/collapsible-popup.xhtml Wed Jun 14 12:06:49 2017
@@ -23,7 +23,7 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<ui:param name="title" value="#{demoBundle.collapsible_popup} <tc:popup>"/>
<p>This page contain some examples for the collapsible concept of a popup. Please have a look at the
- <tc:link label="#{demoBundle.popup}" link="/faces/content/20-component/060-popup/popup.xhtml"/> page
+ <tc:link label="#{demoBundle.popup}" link="/content/20-component/060-popup/popup.xhtml"/> page
in the components section for more details.</p>
<tc:section label="Simple Popup">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/20-collapsible-panel/collapsible-panel.xhtml Wed Jun 14 12:06:49 2017
@@ -24,7 +24,7 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="#{demoBundle.collapsible_panel} <tc:panel>"/>
<p>This page show some examples for the collapsible concept of a
- <tc:link label="#{demoBundle.panel}" link="/faces/content/20-component/050-container/20-panel/panel.xhtml"/>.
+ <tc:link label="#{demoBundle.panel}" link="/content/20-component/050-container/20-panel/panel.xhtml"/>.
Every panel contain a required inputfield to see if a validation occur while submitting.
For better visibility every panel has a border.</p>
<tc:section label="Simple Panel">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/30-collapsible-section/collapsible-section.xhtml Wed Jun 14 12:06:49 2017
@@ -25,7 +25,7 @@
<ui:param name="title" value="#{demoBundle.collapsible_section} <tc:section>"/>
<p>Collapsible concept explained for a
<tc:link label="#{demoBundle.section}"
- link="/faces/content/20-component/050-container/40-section/section.xhtml"/>.</p>
+ link="/content/20-component/050-container/40-section/section.xhtml"/>.</p>
<tc:section label="Simple Section">
<p>A simple collapsible section. The <code>collapsed</code> attribute is set by a controller.
The 'hide'-button got <code>immediate="true"</code> to submitting without validation.</p>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/collapsible.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/collapsible.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/collapsible.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/53-collapsible/collapsible.xhtml Wed Jun 14 12:06:49 2017
@@ -28,12 +28,12 @@
</p>
<p>The collapsible concept is the base for
- <tc:link label="#{demoBundle.box}" link="/faces/content/20-component/050-container/10-box/box.xhtml"/>,
- <tc:link label="#{demoBundle.popup}" link="/faces/content/20-component/060-popup/popup.xhtml"/>,
- <tc:link label="#{demoBundle.panel}" link="/faces/content/20-component/050-container/20-panel/panel.xhtml"/>
+ <tc:link label="#{demoBundle.box}" link="/content/20-component/050-container/10-box/box.xhtml"/>,
+ <tc:link label="#{demoBundle.popup}" link="/content/20-component/060-popup/popup.xhtml"/>,
+ <tc:link label="#{demoBundle.panel}" link="/content/20-component/050-container/20-panel/panel.xhtml"/>
and
<tc:link label="#{demoBundle.section}"
- link="/faces/content/20-component/050-container/40-section/section.xhtml"/>.
+ link="/content/20-component/050-container/40-section/section.xhtml"/>.
It determines how parts or whole components are shown or hidden.
For example, a #{demoBundle.popup} is hidden completely while for #{demoBundle.box} only the content
could be hidden.</p>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/non-faces-request.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/non-faces-request.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/non-faces-request.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/30-concept/90-non-faces-request/non-faces-request.xhtml Wed Jun 14 12:06:49 2017
@@ -32,11 +32,11 @@
<p>
Use these links from external applications:<br/>
- <a href="#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
- <a href="#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=0&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=1&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=2&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=3&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
+ <a href="#{request.contextPath}/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&dswid=#{request.parameterMap['dswid'][0]}">#{request.contextPath}/faces/content/30-concept/90-non-faces-request/x-fish-pond.xhtml?fishId=4&dswid=#{request.parameterMap['dswid'][0]}</a><br/>
</p>
</tc:panel>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/10-tx/tx.xhtml Wed Jun 14 12:06:49 2017
@@ -40,7 +40,7 @@
<p><code class="language-markup"><tc:menu></code> is deprecated.
Use dropdown-menus instead. Have a look at 'Dropdown'-section of the
<tc:link label="#{demoBundle.button_link}"
- link="/faces/content/20-component/040-command/00-button+link/button+link.xhtml"/> page.</p>
+ link="/content/20-component/040-command/00-button+link/button+link.xhtml"/> page.</p>
</tc:section>
<tc:section label="<tx:time">
<p><code class="language-markup"><tx:time></code> has no counterpart of the same name.
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/15-suggest-method/suggest-method.xhtml Wed Jun 14 12:06:49 2017
@@ -26,7 +26,7 @@
is deprecated.
Please use <code class="language-markup"><tc:selectItems/></code> instead.
For more examples please have a look at the
- <tc:link label="#{demoBundle.suggest}" link="/faces/content/20-component/010-input/20-suggest/suggest.xhtml"/>
+ <tc:link label="#{demoBundle.suggest}" link="/content/20-component/010-input/20-suggest/suggest.xhtml"/>
section.</p>
<tc:section label="Deprecated">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/20-toolBar/toolBar.xhtml Wed Jun 14 12:06:49 2017
@@ -25,12 +25,12 @@
<p><code class="language-markup"><tc:toolBar/></code> and
<code class="language-markup"><tc:toolBarCommand/></code> are deprecated.
To replace a toolbar in the header of a component use <tc:link label="#{demoBundle.buttons}"
- link="/faces/content/20-component/040-command/20-buttons/buttons.xhtml"/> or
+ link="/content/20-component/040-command/20-buttons/buttons.xhtml"/> or
<tc:link label="#{demoBundle.links}"
- link="/faces/content/20-component/040-command/25-links/links.xhtml"/> instead.
+ link="/content/20-component/040-command/25-links/links.xhtml"/> instead.
To replace a plain toolbar, use
<tc:link label="#{demoBundle.bar}"
- link="/faces/content/20-component/050-container/60-bar/bar.xhtml"/>.</p>
+ link="/content/20-component/050-container/60-bar/bar.xhtml"/>.</p>
<tc:section label="Content Box Header">
<p>The first box show the deprecated version of a toolbar.
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/35-deprecated/25-menubar/menubar.xhtml Wed Jun 14 12:06:49 2017
@@ -33,7 +33,7 @@
<br/>
For a dropdownmenus have a look at the 'Dropdown' section on the
<tc:link label="#{demoBundle.button_link}"
- link="/faces/content/20-component/040-command/00-button+link/button+link.xhtml"/> page.
+ link="/content/20-component/040-command/00-button+link/button+link.xhtml"/> page.
<br/>
To add a separator just use <code class="language-markup"><tc:separator/></code>.</p>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/index.html?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/index.html (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/index.html Wed Jun 14 12:06:49 2017
@@ -20,7 +20,7 @@
<html>
<head>
<meta http-equiv="Cache-Control" content="no-cache">
- <meta http-equiv="Refresh" content="0; URL=faces/init.xhtml">
+ <meta http-equiv="Refresh" content="0; URL=init.xhtml">
</head>
<body>
</body>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml Wed Jun 14 12:06:49 2017
@@ -94,14 +94,14 @@
</tc:link>
<tc:link label="#{demoBundle.menu_test}" omit="true">
- <tc:link id="runtest" label="#{demoBundle.menu_runTest}" link="/faces/test.xhtml"
+ <tc:link id="runtest" label="#{demoBundle.menu_runTest}" link="/test.xhtml"
immediate="true" disabled="#{!testController.hasTest()}">
<f:param name="base" value="#{testController.base}"/>
</tc:link>
<tc:link id="closetest" label="#{demoBundle.menu_closeTest}" immediate="true"/>
- <tc:link label="#{demoBundle.menu_runTestAll}" link="/faces/testAll.xhtml" target="_blank"
+ <tc:link label="#{demoBundle.menu_runTestAll}" link="/testAll.xhtml" target="_blank"
immediate="true" rendered="#{facesContext.isProjectStage('Development')}"/>
- <tc:link label="#{demoBundle.menu_accessAllPages}" link="/faces/testAccessAllPages.xhtml" target="_blank"
+ <tc:link label="#{demoBundle.menu_accessAllPages}" link="/testAccessAllPages.xhtml" target="_blank"
immediate="true" rendered="#{facesContext.isProjectStage('Development')}"/>
</tc:link>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml Wed Jun 14 12:06:49 2017
@@ -25,7 +25,7 @@
<tc:treeCommand
id="cmd"
label="#{node.title}"
- link="/faces#{node.outcome}"
+ link="#{node.outcome}"
omit="true"/>
</tc:treeNode>
</tc:treeMenu>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml Wed Jun 14 12:06:49 2017
@@ -30,7 +30,7 @@
<div id="qunit"></div>
<div id="qunit-fixture"></div>
- <tc:object id="testframe" src="#{request.contextPath}/faces/#{param['base']}.xhtml">
+ <tc:object id="testframe" src="#{request.contextPath}/#{param['base']}.xhtml">
<tc:style width="100%"/>
</tc:object>
</ui:composition>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml Wed Jun 14 12:06:49 2017
@@ -24,8 +24,8 @@
xmlns:ui="http://java.sun.com/jsf/facelets">
<c:forEach items="#{testController.allPages}" var="page">
<div style="border: 1px solid black">
- <tc:out label="URL" value="#{request.contextPath}/faces/#{page}"/>
- <tc:object src="#{request.contextPath}/faces/#{page}">
+ <tc:out label="URL" value="#{request.contextPath}/#{page}"/>
+ <tc:object src="#{request.contextPath}/#{page}">
<tc:style width="100%" height="300px"/>
</tc:object>
</div>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/ArquillianTest.java Wed Jun 14 12:06:49 2017
@@ -19,9 +19,6 @@
package org.apache.myfaces.tobago.example.demo;
-import java.io.File;
-import java.net.URL;
-
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
@@ -38,6 +35,9 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.FindBy;
+import java.io.File;
+import java.net.URL;
+
/**
* if PhantomJS is configured, ensure that content-security-policy mode="off" is in tobago-config.xml otherwise
* it will result in "Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed
@@ -79,7 +79,7 @@ public class ArquillianTest {
@Test
public void ajaxOnChange() {
- browser.get(contextPath + "/faces/content/20-component/010-input/10-in/in.xhtml");
+ browser.get(contextPath + "/content/20-component/010-input/10-in/in.xhtml");
Assert.assertEquals("On Server", outputLabel.getText());
Assert.assertEquals("", outputField.getText());
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java?rev=1798669&r1=1798668&r2=1798669&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/test/java/org/apache/myfaces/tobago/example/demo/QUnitTests.java Wed Jun 14 12:06:49 2017
@@ -84,7 +84,7 @@ public class QUnitTests {
private void setupBrowser(String base, boolean accessTest) throws UnsupportedEncodingException {
LOG.info("setup browser for: " + base + ".xhtml | accessTest=" + accessTest);
- browser.get(contextPath + "faces/test.xhtml?base=" + URLEncoder.encode(base, "UTF-8")
+ browser.get(contextPath + "test.xhtml?base=" + URLEncoder.encode(base, "UTF-8")
+ (accessTest ? "&accessTest=true" : ""));
}