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/12/08 14:35:18 UTC

[myfaces-tobago] branch master updated (bbf3c2d -> be8da21)

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

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


    from bbf3c2d  improve demo * demo page for tc:out
     new ccdf6ae  Docs for the 4.0.0 release
     new be8da21  Docs for the 4.0.0 release * JavaNCSS doesn't support Java 8 Syntax

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                            | 14 -----
 src/site/apt/api.apt                               |  3 +
 src/site/apt/download.apt                          | 24 ++++++++
 src/site/apt/index.apt                             | 13 +++++
 src/site/apt/release-checklist.apt                 |  9 +--
 src/site/resources/doap_tobago.rdf                 |  9 +++
 .../myfaces/tobago/example/demo/ServerInfo.java    |  2 +-
 .../main/tobago-vm/docker/apache-proxy/index.html  | 12 +++-
 .../src/main/tobago-vm/docker/docker-compose.yml   | 67 ++++++++++++----------
 9 files changed, 102 insertions(+), 51 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
['"commits@myfaces.apache.org" <co...@myfaces.apache.org>'].

[myfaces-tobago] 01/02: Docs for the 4.0.0 release

Posted by lo...@apache.org.
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

commit ccdf6ae66ce8dac40a37428fa42d93bf1bcb9640
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Dec 8 14:52:56 2017 +0100

    Docs for the 4.0.0 release
---
 src/site/apt/api.apt                               |  3 +
 src/site/apt/download.apt                          | 24 ++++++++
 src/site/apt/index.apt                             | 13 +++++
 src/site/apt/release-checklist.apt                 |  7 ++-
 src/site/resources/doap_tobago.rdf                 |  9 +++
 .../myfaces/tobago/example/demo/ServerInfo.java    |  2 +-
 .../main/tobago-vm/docker/apache-proxy/index.html  | 12 +++-
 .../src/main/tobago-vm/docker/docker-compose.yml   | 67 ++++++++++++----------
 8 files changed, 101 insertions(+), 36 deletions(-)

diff --git a/src/site/apt/api.apt b/src/site/apt/api.apt
index 279cc89..07d7e82 100644
--- a/src/site/apt/api.apt
+++ b/src/site/apt/api.apt
@@ -24,6 +24,9 @@ Tobago API Documentation
 *---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
 || Version      || JavaDoc API Documentation                                                    || Tag Library Documentation (TLD)                                                                                                        |
 *---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
+| 4.0.0         | {{{./doc/4.0.0/api/index.html}4.0.0 API Documentation}}                       | {{{./doc/4.0.0/tld/index.html}4.0.0 TLD Documentation}} \                                                                               |
+|               |                                                                               |                                                                                                                                         |
+*---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
 | 3.0.6         | {{{./doc/3.0.6/api/index.html}3.0.6 API Documentation}}                       | {{{./doc/3.0.6/tld/index.html}3.0.6 TLD Documentation}} \                                                                               |
 |               |                                                                               |                                                                                                                                         |
 *---------------+-------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt
index 2714f81..dc8ca83 100644
--- a/src/site/apt/download.apt
+++ b/src/site/apt/download.apt
@@ -33,6 +33,30 @@ Download MyFaces Tobago
   created using GNU tar extensions. Thus they must be untarred with a GNU compatible
   version of tar.
 
+MyFaces Tobago 4.0.0 Distribution
+
+    Release notes can be found in
+    {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&version=12338728}Jira}}.
+
+*-------------------------+--------+---------+----------+-----------+
+|                         | Typ    | Mirrors | Checksum | Signature |
+*-------------------------+--------+---------+----------+-----------+
+| MyFaces Tobago          | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz} myfaces-tobago-4.0.0-dist.tar.gz}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz.sha256} myfaces-tobago-4.0.0-dist.tar.gz.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz.asc} myfaces-tobago-4.0.0-dist.tar.gz.asc}} |
+|                         |        |                                                                                                                                           | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz.md5}    myfaces-tobago-4.0.0-dist.tar.gz.md5}}                 | |
+*-------------------------+--------+---------+----------+-----------+
+| MyFaces Tobago          | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip} myfaces-tobago-4.0.0-dist.zip}}                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip.sha256} myfaces-tobago-4.0.0-dist.zip.sha256}}\                   | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip.asc} myfaces-tobago-4.0.0-dist.zip.asc}} |
+|                         |        |                                                                                                                                           | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip.md5}    myfaces-tobago-4.0.0-dist.zip.md5}}                       | |
+*-------------------------+--------+---------+----------+-----------+
+| MyFaces Tobago Source   | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/source/myfaces-tobago-4.0.0-source-release.zip} myfaces-tobago-4.0.0-source-release.zip}} | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.0.0-source-release.zip.sha256} myfaces-tobago-4.0.0-source-release.zip.sha256}}\ | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.0.0-source-release.zip.asc} myfaces-tobago-4.0.0-source-release.zip.asc}} |
+|                         |        |                                                                                                                                           | {{{https://www.apache.org/dist/myfaces/source/myfaces-tobago-4.0.0-source-release.zip.md5}    myfaces-tobago-4.0.0-source-release.zip.md5}}     | |
+*-------------------------+--------+---------+----------+-----------+
+| MyFaces Tobago Example  | tar.gz | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz} myfaces-tobago-4.0.0-example.tar.gz}}       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz.sha256} myfaces-tobago-4.0.0-example.tar.gz.sha256}}\       | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz.asc} myfaces-tobago-4.0.0-example.tar.gz.asc}} |
+|                         |        |                                                                                                                                           | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.tar.gz.md5}    myfaces-tobago-4.0.0-example.tar.gz.md5}}           | |
+*-------------------------+--------+---------+----------+-----------+
+| MyFaces Tobago Example  | zip    | {{{http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-example.zip} myfaces-tobago-4.0.0-example.zip}}             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.zip.sha256} myfaces-tobago-4.0.0-example.zip.sha256}}\             | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.zip.asc} myfaces-tobago-4.0.0-example.zip.asc}} |
+|                         |        |                                                                                                                                           | {{{https://www.apache.org/dist/myfaces/binaries/myfaces-tobago-4.0.0-example.zip.md5}    myfaces-tobago-4.0.0-example.zip.md5}}                 | |
+*-------------------------+--------+---------+----------+-----------+
+
 MyFaces Tobago 3.0.6 Distribution
 
     Release notes can be found in
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 359e58f..f21ce35 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -47,6 +47,19 @@ Apache Tobago
 
 News
 
+* December 7, 2017 - MyFaces Tobago 4.0.0 Released
+
+      The MyFaces Tobago component library in version 4.0.0 has been released.
+
+      A short overview you can find in the
+      {{{http://tobago-vm.apache.org/demo-4-staging/content/10-intro/28-new+in+4+0/new+in+4+0.xhtml}Tobago Demo 4}}.
+
+      Release notes can be found in
+      {{{http://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310273&styleName=Html&version=12338728}Jira}}.
+
+      \ {}
+      ~~ hack for a bit space
+
 * September 19, 2017 - MyFaces Tobago 3.0.6 Released
 
       The MyFaces Tobago component library in version 3.0.6 has been released.
diff --git a/src/site/apt/release-checklist.apt b/src/site/apt/release-checklist.apt
index ff0fcce..1a9b08c 100644
--- a/src/site/apt/release-checklist.apt
+++ b/src/site/apt/release-checklist.apt
@@ -150,12 +150,13 @@ mvn site:stage -DstagingDirectory=/Volumes/tobago-site/tobago-publish
 
   * Update the site after the distribution is on the Apache mirrors available.
 
-  * Workaround for Tobago 3 TLD documentation. There is a bug (TOBAGO-1654) so the TLDDOC will not be distributed.
+  * Workaround for Tobago 3 and higher TLD documentation.
+    There is a bug (TOBAGO-1654) so the TLDDOC will not be distributed.
     To upload it into the Maven repo follow these steps:
 
 +------------------------+
-VERSION=3.0.6
-svn co https://svn.apache.org/repos/asf/myfaces/tobago/tags/tobago-${VERSION}
+VERSION=4.0.0
+git clone -b tobago-${VERSION} https://github.com/apache/myfaces-tobago tobago-${VERSION}
 cd tobago-${VERSION}/tobago-core
 mvn clean install -Papache-release
 mvn deploy:deploy-file \
diff --git a/src/site/resources/doap_tobago.rdf b/src/site/resources/doap_tobago.rdf
index 913026d..368d310 100644
--- a/src/site/resources/doap_tobago.rdf
+++ b/src/site/resources/doap_tobago.rdf
@@ -71,6 +71,15 @@
         <file-release>http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-3.0.6-dist.zip</file-release>
       </Version>
     </release>
+    <release>
+      <Version>
+        <name>Latest stable release of 4.x</name>
+        <created>2017-12-07</created>
+        <revision>4.0.0</revision>
+        <file-release>http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-dist.tar.gz</file-release>
+        <file-release>http://www.apache.org/dyn/closer.lua/myfaces/binaries/myfaces-tobago-4.0.0-dist.zip</file-release>
+      </Version>
+    </release>
     <repository>
       <GitRepository>
         <location rdf:resource="https://gitbox.apache.org/repos/asf/myfaces-tobago.git"/>
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
index d059769..baf0e1c 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ServerInfo.java
@@ -50,7 +50,7 @@ public class ServerInfo {
   private static final String CONFIG_FILE_DEFAULT = "/etc/tobago-example-demo.properties";
   private static final String ENABLED_KEY = "server.info.enabled";
 
-  private static final String LAST_RELEASED_VERSION = "3.0.6";
+  private static final String LAST_RELEASED_VERSION = "4.0.0";
 
   private String version;
 
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index 6b114b8..f258a03 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -46,17 +46,23 @@
     </div>
 
     <div class="masthead-followup row m-0 border border-white">
+      <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
+        <h3>Tobago 4</h3>
+        <h5>4.0.0</h5>
+        <p>Last released version.</p>
+        <a class="btn btn-success" href="/demo-4-release/">Demo</a>
+      </div>
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">
-        <h3 class="na">Tobago 4 is not yet released.</h3>
+        <h3 class="na">Currently no voting active.</h3>
       </div>
-      <!--<div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white disabled d-md-flex d-none">-->
+<!--
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
-        <!--<h3 class="na">Currently no voting active.</h3>-->
         <h3>Tobago 4</h3>
         <h5>4.0.0 (coming soon)</h5>
         <p>Voting in progress.</p>
         <a class="btn btn-warning" href="/demo-4-staging/">Demo</a>
       </div>
+-->
       <div class="col-12 col-md-4 p-3 p-md-5 bg-light border border-white">
         <h3>Tobago 4</h3>
         <h5>4.0.1-SNAPSHOT</h5>
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
index 6a84f7d..717fec4 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
@@ -21,47 +21,56 @@ services:
       - "80:80"
 # todo     - "443:443"
     links:
+      - demo-4-release
+#      - demo-4-staging
       - demo-4-snapshot
-      - demo-4-staging
-      - demo-3-snapshot
-#      - demo-3-staging
       - demo-3-release
-      - demo-2-snapshot
-#      - demo-2-staging
+#      - demo-3-staging
+      - demo-3-snapshot
       - demo-2-release
+#      - demo-2-staging
+      - demo-2-snapshot
       - demo-1-5-release
       - demo-1-0-release
     depends_on:
+      - demo-4-release
+#      - demo-4-staging
       - demo-4-snapshot
-      - demo-4-staging
-      - demo-3-snapshot
-#      - demo-3-staging
       - demo-3-release
-      - demo-2-snapshot
-#      - demo-2-staging
+#      - demo-3-staging
+      - demo-3-snapshot
       - demo-2-release
+#      - demo-2-staging
+      - demo-2-snapshot
       - demo-1-5-release
       - demo-1-0-release
-  demo-4-snapshot:
+  demo-4-release:
     image: tobago/tomcat:latest
     environment:
-      - TOBAGO_VERSION=4.0.1-SNAPSHOT
-      - CONTEXT_PATH=demo-4-snapshot
+      - TOBAGO_VERSION=4.0.0
+      - CONTEXT_PATH=demo-4-release
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-4-staging:
+#  demo-4-staging:
+#    image: tobago/tomcat:latest
+#    environment:
+#      - TOBAGO_VERSION=4.0.0
+#      - STAGING_NUMBER=1122
+#      - CONTEXT_PATH=demo-4-staging
+#    volumes:
+#      - /opt/docker/artifacts:/opt/docker/artifacts
+  demo-4-snapshot:
     image: tobago/tomcat:latest
     environment:
-      - TOBAGO_VERSION=4.0.0
-      - STAGING_NUMBER=1122
-      - CONTEXT_PATH=demo-4-staging
+      - TOBAGO_VERSION=4.0.1-SNAPSHOT
+      - CONTEXT_PATH=demo-4-snapshot
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-3-snapshot:
+  demo-3-release:
     image: tobago/tomcat:latest
     environment:
-      - TOBAGO_VERSION=3.0.7-SNAPSHOT
-      - CONTEXT_PATH=demo-3-snapshot
+      - TOBAGO_VERSION=3.0.6
+      - CONTEXT_PATH=demo-3-release
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
 #  demo-3-staging:
@@ -72,18 +81,18 @@ services:
 #      - CONTEXT_PATH=demo-3-staging
 #    volumes:
 #      - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-3-release:
+  demo-3-snapshot:
     image: tobago/tomcat:latest
     environment:
-      - TOBAGO_VERSION=3.0.6
-      - CONTEXT_PATH=demo-3-release
+      - TOBAGO_VERSION=3.0.7-SNAPSHOT
+      - CONTEXT_PATH=demo-3-snapshot
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-2-snapshot:
+  demo-2-release:
     image: tobago/tomcat:latest
     environment:
-      - TOBAGO_VERSION=2.1.1-SNAPSHOT
-      - CONTEXT_PATH=demo-2-snapshot
+      - TOBAGO_VERSION=2.1.0
+      - CONTEXT_PATH=demo-2-release
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
 #  demo-2-staging:
@@ -94,11 +103,11 @@ services:
 #      - CONTEXT_PATH=demo-3-staging
 #    volumes:
 #      - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-2-release:
+  demo-2-snapshot:
     image: tobago/tomcat:latest
     environment:
-      - TOBAGO_VERSION=2.1.0
-      - CONTEXT_PATH=demo-2-release
+      - TOBAGO_VERSION=2.1.1-SNAPSHOT
+      - CONTEXT_PATH=demo-2-snapshot
     volumes:
       - /opt/docker/artifacts:/opt/docker/artifacts
   demo-1-5-release:

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.

[myfaces-tobago] 02/02: Docs for the 4.0.0 release * JavaNCSS doesn't support Java 8 Syntax

Posted by lo...@apache.org.
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

commit be8da21992e20718fc0052689c70132f1fb5ab06
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Dec 8 15:34:36 2017 +0100

    Docs for the 4.0.0 release
    * JavaNCSS doesn't support Java 8 Syntax
---
 pom.xml                            | 14 --------------
 src/site/apt/release-checklist.apt |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 039ab60..1e6775c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -345,20 +345,6 @@
         <artifactId>jdepend-maven-plugin</artifactId>
         <version>2.0</version>
       </plugin>
-
-      <!-- http://jira.codehaus.org/browse/MJNCSS-4
-           JavaNCSS still has problems with annotations for local variables -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javancss-maven-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <excludes>
-            <exclude>org/apache/myfaces/tobago/internal/layout/Grid.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
diff --git a/src/site/apt/release-checklist.apt b/src/site/apt/release-checklist.apt
index 1a9b08c..9d09bc4 100644
--- a/src/site/apt/release-checklist.apt
+++ b/src/site/apt/release-checklist.apt
@@ -138,7 +138,7 @@ src/site/resources/doap_tobago.rdf
 
 +------------------------+
 cd /Volumes/tobago-site
-svn co https://svn.apache.org/repos/asf/myfaces/tobago/trunk tobago-trunk
+git clone https://github.com/apache/myfaces-tobago tobago-trunk
 svn co https://svn.apache.org/repos/asf/myfaces/site/publish/tobago tobago-publish
 cd tobago-trunk
 export MAVEN_OPTS="-Xmx1500m ${MAVEN_OPTS}"

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.