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 2021/04/07 19:15:24 UTC

[myfaces-tobago] branch tobago-4.x updated: doc: fix javadoc and api links issue: TOBAGO-2070

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch tobago-4.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/tobago-4.x by this push:
     new ddceee2  doc: fix javadoc and api links issue: TOBAGO-2070
ddceee2 is described below

commit ddceee2ac65c42b76edd8303cc15e731837171f0
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Apr 7 20:55:13 2021 +0200

    doc: fix javadoc and api links
    issue: TOBAGO-2070
---
 .../org/apache/myfaces/tobago/example/demo/ApiController.java     | 8 ++++++--
 .../src/main/webapp/content/10-intro/80-api/api.xhtml             | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
index d79a23c..8b759e0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ApiController.java
@@ -62,8 +62,12 @@ public class ApiController implements Serializable {
     return releases;
   }
 
-  public String getBase() {
-    return "https://myfaces.apache.org/tobago";
+  public String getApiBase() {
+    return "https://javadoc.io/doc/org.apache.myfaces.tobago/tobago-core";
+  }
+
+  public String getTldBase() {
+    return "https://myfaces.apache.org/tobago/doc";
   }
 
   public boolean isOnlyCurrent() {
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml
index c17ad62..177c0f4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/10-intro/80-api/api.xhtml
@@ -36,14 +36,14 @@
       </tc:column>
       <tc:column label="JavaDoc API Documentation">
         <tc:link label="#{release.version} API Documentation"
-                 link="#{apiController.base}/doc/#{release.version}/api/index.html"/>
+                 link="#{apiController.apiBase}/#{release.version}/index.html"/>
       </tc:column>
       <tc:column label="Tag Library Documentation (TLD)">
         <tc:link label="#{release.version} TLD &lt;tc:> Documentation"
-                 link="#{apiController.base}/doc/#{release.version}/tld/index.html"/>
+                 link="#{apiController.tldBase}/#{release.version}/tld/index.html"/>
         <f:verbatim rendered="#{release.tx}"><br/></f:verbatim>
         <tc:link label="#{release.version} TLD &lt;tx:> Documentation" rendered="#{release.tx}"
-                 link="#{apiController.base}/doc/#{release.version}/tld-tx/index.html"/>
+                 link="#{apiController.tldBase}/#{release.version}/tld-tx/index.html"/>
       </tc:column>
     </tc:sheet>