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:47:46 UTC
[myfaces-tobago] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new d772526 doc: fix javadoc and api links issue: TOBAGO-2070
d772526 is described below
commit d772526fa87eb16a4f19e970828c5801bb9a548e
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Apr 7 21:16:04 2021 +0200
doc: fix javadoc and api links
issue: TOBAGO-2070
---
.../myfaces/tobago/example/demo/ApiController.java | 8 +-
.../myfaces/tobago/example/demo/Release.java | 125 +--------------------
.../main/webapp/content/10-intro/80-api/API.xhtml | 7 +-
3 files changed, 9 insertions(+), 131 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 cfd09da..0a2ff71 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/java/org/apache/myfaces/tobago/example/demo/Release.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
index 8b72868..37fc585 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/Release.java
@@ -21,129 +21,12 @@ package org.apache.myfaces.tobago.example.demo;
public enum Release {
- /*v1_0_7("12310824"),
- v1_0_8("12310900"),
- v1_0_9("12312042"),
- v1_0_10("12312204"),
- v1_0_11("12312376"),
- v1_0_12("12312498"),
- v1_0_13("12312766"),
- v1_0_14("12312878"),
- v1_0_15("12312929"),
- v1_0_16("12312966"),
- v1_0_17("12313084"),
- v1_0_18("12313150"),
- v1_0_19("12313372"),
- v1_0_20("12313447"),
- v1_0_21("12313470"),
- v1_0_22("12314027"),
- v1_0_23("12314159"),
- v1_0_24("12314193"),
- v1_0_25("12314527"),
- v1_0_26("12314961"),
- v1_0_27("12315099"),
- v1_0_28("12315109"),
- v1_0_29("12315262"),
- v1_0_30("12315336"),
- v1_0_31("12315383"),
- v1_0_32("12315489"),
- v1_0_33("12315586"),
- v1_0_34("12316162"),
- v1_0_35("12316183"),
- v1_0_36("12316297"),
- v1_0_37("12316458"),
- v1_0_38("12317350"),
- v1_0_39("12319455"),
- v1_0_40("12319866"),
- v1_0_41("12324116"),
- v1_0_42("12326705"),
- v1_0_43("12333048", false, true),
-
- v1_5_0_alpha_2("12314340"),
- v1_5_0_beta_1("12316222"),
- v1_5_0_beta_2("12317052"),
- v1_5_0("12312205"),
- v1_5_1("12319154"),
- v1_5_2("12319248"),
- v1_5_3("12319499"),
- v1_5_4("12319864"),
- v1_5_5("12319865"),
- v1_5_6("12321251"),
- v1_5_7("12321444"),
- v1_5_8("12322450"),
- v1_5_9("12323506"),
- v1_5_10("12324008"),
- v1_5_11("12324453"),
- v1_5_12("12325597"),
- v1_5_13("12325858"),
- v1_5_14("12326706", false, true),
-
- v1_6_0_beta_1("12321691"),
- v1_6_0_beta_2("12321701"),
-
- v2_0_0_alpha_1("12321874"),
- v2_0_0_alpha_2("12324818"),
- v2_0_0_alpha_3("12325247"),
- v2_0_0_beta_1("12325856"),
- v2_0_0_beta_2("12326662"),
- v2_0_0_beta_3("12326693"),
- v2_0_0_beta_4("12326809"),
- v2_0_0("12321253"),
- v2_0_1("12327455"),
- v2_0_2("12327500"),
- v2_0_3("12328040"),
- v2_0_4("12328041"),
- v2_0_5("12329025"),
- v2_0_6("12329161"),
- v2_0_7("12329376"),
- v2_0_8("12329723"),
- v2_0_9("12332146"),
- v2_0_10("12334742"),
- v2_1_0("12338208"),
- v2_1_1("12341246"),
- v2_2_0("12342740"),
- v2_3_0("12343979"),
- v2_4_0("12344409"),
- v2_4_1("12344899"),
- v2_4_2("12345177"),
- v2_4_3("12346997"),
-
- */
v2_4_4("12349632", true),
v2_4_5("12349661", false, true),
v2_5_0("12345962", false, true),
- /*v3_0_0_alpha_1("12325880"),
- v3_0_0_alpha_2("12333887"),
- v3_0_0_alpha_3("12334363"),
- v3_0_0_alpha_4("12337842"),
- v3_0_0_alpha_5("12338164"),
- v3_0_0_alpha_6("12338231"),
- v3_0_0_alpha_7("12338278"),
- v3_0_0_beta_1("12333888"),
- v3_0_0("12325880"),
- v3_0_1("12338730"),
- v3_0_2("12339171"),
- v3_0_3("12339442"),
- v3_0_4("12340258"),
- v3_0_5("12340325"),
- v3_0_6("12341574"),
- v3_1_0("12342388"),
- v3_1_1("12343478"),
-
- /*v4_0_0("12338728"),
- v4_1_0("12339443"),
- v4_2_0("12342739"),
- v4_2_1("12342849"),
- v4_3_0("12342850"),
- v4_3_1("12343951"),
- v4_3_2("12344394"),
- v4_4_0("12344541"),
- v4_4_1("12345061"),
- v4_5_0("12345562"),
- v4_5_1("12348200"),
- v4_5_2("12349344"),*/
v4_5_3("12349662", true),
+ v4_5_4("12350057", false, true),
v5_0_0("12338729", false, true),
v5_0_1("12344151", false, true),
@@ -151,7 +34,6 @@ public enum Release {
private final String jira;
private final String version;
- private final boolean tx;
private final boolean current;
private final boolean unreleased;
@@ -172,17 +54,12 @@ public enum Release {
.replaceAll("_alpha_", "-alpha-")
.replaceAll("_beta_", "-beta-")
.replace('_', '.');
- tx = version.startsWith("1.5") || version.startsWith("1.6");
}
public String getVersion() {
return version;
}
- public boolean isTx() {
- return tx;
- }
-
public boolean isCurrent() {
return current;
}
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 66f1731..dfe89cf 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
@@ -35,14 +35,11 @@
</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 <tc:> Documentation"
- link="#{apiController.base}/doc/#{release.version}/tld/index.html"/>
- <f:verbatim rendered="#{release.tx}"><br/></f:verbatim>
- <tc:link label="#{release.version} TLD <tx:> Documentation" rendered="#{release.tx}"
- link="#{apiController.base}/doc/#{release.version}/tld-tx/index.html"/>
+ link="#{apiController.tldBase}/#{release.version}/tld/index.html"/>
</tc:column>
</tc:sheet>