You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2018/02/22 23:03:39 UTC
[isis] branch release-1.16.1-RC2 updated (8a05894 -> d14dc6c)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 8a05894 ISIS-1813: updates website for 1.16.1
new 9d00def ISIS-1813: updates the procedure for publishing website
new db99f6d ISIS-1813: bumps navbar to 1.16.1
new d14dc6c ISIS-1813: updates html template for website and root index.html
The 3 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:
.../cgcom/_cgcom_post-release-successful.adoc | 37 ++++++++++--
adocs/documentation/src/main/asciidoc/index.html | 67 +++++++++++++++-------
adocs/template/document.html.erb | 2 +-
3 files changed, 79 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/03: ISIS-1813: updates html template for website and root
index.html
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit d14dc6cb0409f5d233c700fc7dd02286b92979e0
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 22 23:03:27 2018 +0000
ISIS-1813: updates html template for website and root index.html
---
adocs/documentation/src/main/asciidoc/index.html | 67 +++++++++++++++++-------
adocs/template/document.html.erb | 2 +-
2 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/index.html b/adocs/documentation/src/main/asciidoc/index.html
index f021210..11337a9 100644
--- a/adocs/documentation/src/main/asciidoc/index.html
+++ b/adocs/documentation/src/main/asciidoc/index.html
@@ -176,26 +176,30 @@ table.CodeRay td.code>pre{padding:0}
<!-- Navbar that will collapse on mobile screens -->
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
- <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Versions<span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li><a href="documentation.html">1.16.0 (current)</a></li>
- <li role="separator" class="divider"></li>
- <li><a href="versions/SNAPSHOT/documentation.html">1.16.1-SNAPSHOT</a></li>
- <li role="separator" class="divider"></li>
- <li class="dropdown-header">Archive</li>
- <li><a href="versions/1.15.1/documentation.html">1.15.1</a></li>
- <li><a href="versions/1.15.0/documentation.html">1.15.0</a></li>
- <li><a href="versions/1.14.0/documentation.html">1.14.0</a></li>
- <li><a href="versions/1.13.2.1/documentation.html">1.13.2.1</a></li>
- <li><a href="versions/1.13.2/documentation.html">1.13.2</a></li>
- <li><a href="versions/1.13.1/documentation.html">1.13.1</a></li>
- <li><a href="versions/1.13.0/documentation.html">1.13.0</a></li>
- <li><a href="versions/1.12.2/documentation.html">1.12.2</a></li>
- <li><a href="versions/1.12.1/documentation.html">1.12.1</a></li>
- <li><a href="versions/1.12.0/documentation.html">1.12.0</a></li>
- <li><a href="versions/1.11.1/documentation.html">1.11.1</a></li>
- <li><a href="versions/1.11.0/documentation.html">1.11.0</a></li>
- </ul> </li>
+ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Documentation<span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="./documentation.html">Table of Contents</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">User Guides</li>
+ <li><a href="./guides/ugfun/ugfun.html">Fundamentals</a></li>
+ <li><a href="./guides/ugvw/ugvw.html">Wicket Viewer</a></li>
+ <li><a href="./guides/ugvro/ugvro.html">Restful Objects Viewer</a></li>
+ <li><a href="./guides/ugodn/ugodn.html">DataNucleus Object Store</a></li>
+ <li><a href="./guides/ugsec/ugsec.html">Security</a></li>
+ <li><a href="./guides/ugtst/ugtst.html">Testing</a></li>
+ <li><a href="./guides/ugbtb/ugbtb.html">Beyond the Basics</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Reference Guides</li>
+ <li><a href="./guides/rgant/rgant.html">Annotations</a></li>
+ <li><a href="./guides/rgsvc/rgsvc.html">Domain Services</a></li>
+ <li><a href="./guides/rgcfg/rgcfg.html">Core Config' Properties</a></li>
+ <li><a href="./guides/rgcms/rgcms.html">Classes, Methods and Schema</a></li>
+ <li><a href="./guides/rgmvn/rgmvn.html">Maven plugin</a></li>
+ <li><a href="./guides/rgfis/rgfis.html">Framework Internal Services</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Javadoc</li>
+ <li><a href="http://javadoc.io/doc/org.apache.isis.core/isis-core-applib">Applib</a></li>
+ </ul> </li>
<li class="dropdown hidden-sm hidden-md"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Downloads<span class="caret"></span></a>
<ul class="dropdown-menu">
<li class="dropdown-header">Maven archetypes</li>
@@ -245,6 +249,29 @@ table.CodeRay td.code>pre{padding:0}
</div>
</form>
</div>
+ <ul class="nav navbar-nav navbar-right">
+ <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Versions<span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="documentation.html">1.16.1 (current)</a></li>
+ <li role="separator" class="divider"></li>
+ <li><a href="versions/SNAPSHOT/documentation.html">2.0.0-M1-SNAPSHOT</a></li>
+ <li role="separator" class="divider"></li>
+ <li class="dropdown-header">Archive</li>
+ <li><a href="versions/1.16.0/documentation.html">1.16.0</a></li>
+ <li><a href="versions/1.15.1/documentation.html">1.15.1</a></li>
+ <li><a href="versions/1.15.0/documentation.html">1.15.0</a></li>
+ <li><a href="versions/1.14.0/documentation.html">1.14.0</a></li>
+ <li><a href="versions/1.13.2.1/documentation.html">1.13.2.1</a></li>
+ <li><a href="versions/1.13.2/documentation.html">1.13.2</a></li>
+ <li><a href="versions/1.13.1/documentation.html">1.13.1</a></li>
+ <li><a href="versions/1.13.0/documentation.html">1.13.0</a></li>
+ <li><a href="versions/1.12.2/documentation.html">1.12.2</a></li>
+ <li><a href="versions/1.12.1/documentation.html">1.12.1</a></li>
+ <li><a href="versions/1.12.0/documentation.html">1.12.0</a></li>
+ <li><a href="versions/1.11.1/documentation.html">1.11.1</a></li>
+ <li><a href="versions/1.11.0/documentation.html">1.11.0</a></li>
+ </ul> </li>
+ </ul>
</div>
</div>
</nav>
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index 5b1fcc5..02e66db 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -203,7 +203,7 @@
</form>
</div>
- <p class="nav navbar-text navbar-right small">v1.16.1</p>
+ <p class="nav navbar-text navbar-right small">v2.0.0-M1-SNAPSHOT</p>
</div>
</div>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/03: ISIS-1813: updates the procedure for publishing
website
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9d00defd8cd71ea6dd3d7359f64188e6ff79ea57
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 22 22:25:39 2018 +0000
ISIS-1813: updates the procedure for publishing website
---
.../cgcom/_cgcom_post-release-successful.adoc | 37 ++++++++++++++++++----
1 file changed, 31 insertions(+), 6 deletions(-)
diff --git a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
index c370d8e..c3b7ca3 100644
--- a/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/cgcom/_cgcom_post-release-successful.adoc
@@ -274,16 +274,29 @@ For more information on DOAP files, see these http://projects.apache.org/doap.ht
* Update the https://git-wip-us.apache.org/repos/asf/isis/repo?p=isis.git;a=blob_plain;f=STATUS;hb=HEAD[STATUS] file (in root of Apache Isis' source) should be updated with details of the new release.
-* commit the `.adoc` changes and publish to the `isis-site` repo.
+* commit the `.adoc` changes
+Now we need to publish the website.
+
+* locate `template/document.html.erb` file, and remove `-SNAPSHOT` from the navbar:
+
++
+[source,html]
+----
+<p class="nav navbar-text navbar-right small">v2.0.0-M1</p>
+----
+
+* publish to the `isis-site` repo.
+
++
This will have published to the `SNAPSHOT` directory of the `isis-site` repo.
+
Now, in the `isis-site` repo itself:
* double check that a copy of `current` exists as a named directory under `content/versions`
+
-If for any reason it isn't there, then create a copy before it gets deleted in the step below.
-Also, take a copy of the `index.html` with one that redirects up to the home page (see a few steps below for an example).
+If for any reason it isn't there, then create a copy (under `content/versions`) before it gets deleted in the step below.
* delete the `current` version and then rename the just-published `SNAPSHOT` as `current`:
@@ -331,11 +344,23 @@ You can take a copy from one of the older named versions, or just use this text:
At this point the files in the root (directly under `content`) will still be out of date; the publish process simply preserves whatever is in `content/versions/current`.
Also, the `SNAPSHOT` will be missing (above it was renamed to `current`).
-To fix both of these issues, simply publish the website one more time (from the `isis` main repo).
+And, we also need to make sure that any future publishing of snapshots has the correct version in the navbar.
-Finally, preview the changes (in the `isis-site`).
-If everything looks ok, then push the changes to make live.
+Therefore:
+
+* locate `template/document.html.erb` file, and add in `-SNAPSHOT` for version in the navbar:
+
++
+[source,html]
+----
+<p class="nav navbar-text navbar-right small">v2.0.0-M2-SNAPSHOT</p>
+----
+
+* publish the website once more (from the `isis` main repo).
+* Finally, preview the changes (using `sh preview-html.sh` in the `isis-site`).
+
+If everything looks ok, then push the changes to make live.
== Announce the release
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/03: ISIS-1813: bumps navbar to 1.16.1
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch release-1.16.1-RC2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit db99f6df298b0ea6a5cc6207e38eb342dfa3fad6
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Feb 22 22:26:11 2018 +0000
ISIS-1813: bumps navbar to 1.16.1
---
adocs/template/document.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/adocs/template/document.html.erb b/adocs/template/document.html.erb
index 7b291b9..5b1fcc5 100644
--- a/adocs/template/document.html.erb
+++ b/adocs/template/document.html.erb
@@ -203,7 +203,7 @@
</form>
</div>
- <p class="nav navbar-text navbar-right small">v1.16.1-SNAPSHOT</p>
+ <p class="nav navbar-text navbar-right small">v1.16.1</p>
</div>
</div>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.