diff --git a/user_guides/connector/pom.xml b/user_guides/connector/pom.xml index f036b11752..1bc2ede3c0 100644 --- a/user_guides/connector/pom.xml +++ b/user_guides/connector/pom.xml @@ -1,7 +1,7 @@ - 4.0.0 + - org.eclipse.ee4j - project - 1.0.5 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jca + + jakarta.resource + jakarta.resource-tck-user-guide pom - 2.0.1 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Connectors for Jakarta EE, Release - 2.0 - + 2.1.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Connectors for Jakarta EE, Release 2.1 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Connectors - - Jakarta-Connectors-TCK-Users-Guide.pdf - true + DRAFT @@ -56,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - + build-dist + package @@ -99,163 +67,33 @@ generate-toc generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - generate-book generate-resources - - book - org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - diff --git a/user_guides/connector/src/main/jbake/templates/footer.ftl b/user_guides/connector/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 9111843941..0000000000 --- a/user_guides/connector/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/connector/src/main/jbake/templates/header.ftl b/user_guides/connector/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/connector/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jacc/pom.xml b/user_guides/jacc/pom.xml index bfb8434d14..25df5744b8 100644 --- a/user_guides/jacc/pom.xml +++ b/user_guides/jacc/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 - org.eclipse.ee4j - project - 1.0.6 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jacc - 2.1.0 + jakarta.authorization + jakarta.authorization-tck-user-guide pom + 3.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Authorization for Jakarta EE, Release 3.0 ${project.version} - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Authorization for Jakarta EE, Release 2.1 + + ${project.parent.version} + + Authorization + + DRAFT + @@ -39,231 +48,52 @@ - - UTF-8 - ${project.build.directory}/staging - true - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 - - - Jakarta-Authorization-TCK-Users-Guide.pdf - - - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-maven - - enforce - - - - - 3.5.4 - - - [11,) - You need JDK11 or newer - - - + build-dist + package - org.glassfish.doc glassfish-doc-maven-plugin generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources - org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - - - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - diff --git a/user_guides/jacc/src/main/jbake/assets/css/style.css b/user_guides/jacc/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jacc/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jacc/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jacc/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jacc/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jacc/src/main/jbake/jbake.properties b/user_guides/jacc/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jacc/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jacc/src/main/jbake/templates/footer.ftl b/user_guides/jacc/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/jacc/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jacc/src/main/jbake/templates/header.ftl b/user_guides/jacc/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jacc/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jacc/src/main/jbake/templates/menu.ftl b/user_guides/jacc/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jacc/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jacc/src/main/jbake/templates/page.ftl b/user_guides/jacc/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jacc/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jacc/src/theme/jakartaee-theme.yml b/user_guides/jacc/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jacc/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/jaxws/pom.xml b/user_guides/jaxws/pom.xml index 2ee09e1d75..9b58ed313c 100644 --- a/user_guides/jaxws/pom.xml +++ b/user_guides/jaxws/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.7 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jaxws + + jakarta.xml.ws + jakarta.xml.ws-tck-user-guide pom - 4.0.0 - Eclipse Foundation Technology Compatibility Kit User's Guide Jakarta XML Binding for Jakarta EE, Release 4.0 + 4.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta XML Web Services for Jakarta EE, Release 4.0 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.5.3 - 2.2.1 - 2.2.2 - 1.6.2 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Xml-WS - - XML-WS-TCK-Users-Guide.pdf - true + DRAFT @@ -53,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [11,) - You need Java SE 11 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [A-C0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/jaxws/src/main/jbake/assets/css/style.css b/user_guides/jaxws/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jaxws/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jaxws/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jaxws/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jaxws/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jaxws/src/main/jbake/jbake.properties b/user_guides/jaxws/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jaxws/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jaxws/src/main/jbake/templates/footer.ftl b/user_guides/jaxws/src/main/jbake/templates/footer.ftl deleted file mode 100644 index cb4fbe584b..0000000000 --- a/user_guides/jaxws/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2022 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jaxws/src/main/jbake/templates/header.ftl b/user_guides/jaxws/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jaxws/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jaxws/src/main/jbake/templates/menu.ftl b/user_guides/jaxws/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jaxws/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jaxws/src/main/jbake/templates/page.ftl b/user_guides/jaxws/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jaxws/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jaxws/src/theme/jakartaee-theme.yml b/user_guides/jaxws/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jaxws/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/jms/pom.xml b/user_guides/jms/pom.xml index 0efdaedf51..6cfeb9913f 100644 --- a/user_guides/jms/pom.xml +++ b/user_guides/jms/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.5 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jms + + jakarta.jms + jakarta.jms-tck-user-guide pom - 3.0.1 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Messaging for Jakarta EE, Release 3.0 + 3.1.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Messaging for Jakarta EE, Release 3.1 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Messaging - - Jakarta-Messaging-TCK-Users-Guide.pdf - true + DRAFT @@ -53,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/jms/src/main/jbake/assets/css/style.css b/user_guides/jms/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jms/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jms/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jms/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jms/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jms/src/main/jbake/jbake.properties b/user_guides/jms/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jms/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jms/src/main/jbake/templates/footer.ftl b/user_guides/jms/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/jms/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jms/src/main/jbake/templates/header.ftl b/user_guides/jms/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jms/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jms/src/main/jbake/templates/menu.ftl b/user_guides/jms/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jms/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jms/src/main/jbake/templates/page.ftl b/user_guides/jms/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jms/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jms/src/theme/jakartaee-theme.yml b/user_guides/jms/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jms/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/jpa/pom.xml b/user_guides/jpa/pom.xml index c17dc5ec0a..79080da643 100644 --- a/user_guides/jpa/pom.xml +++ b/user_guides/jpa/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.7 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jpa + + jakarta.persistence + jakarta.persistence-tck-user-guide pom - 3.1.0 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Persistence for Jakarta EE, Release 3.1 + 3.2.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Persistence for Jakarta EE, Release 3.2 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.5.3 - 2.2.1 - 2.2.2 - 1.6.2 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Persistence - - Jakarta-Persistence-TCK-Users-Guide.pdf - true + DRAFT @@ -53,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [11,) - You need Java SE 11 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [A-C0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/jpa/src/main/jbake/assets/css/style.css b/user_guides/jpa/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jpa/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jpa/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jpa/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jpa/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jpa/src/main/jbake/jbake.properties b/user_guides/jpa/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jpa/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jpa/src/main/jbake/templates/footer.ftl b/user_guides/jpa/src/main/jbake/templates/footer.ftl deleted file mode 100644 index cb4fbe584b..0000000000 --- a/user_guides/jpa/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2022 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jpa/src/main/jbake/templates/header.ftl b/user_guides/jpa/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jpa/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jpa/src/main/jbake/templates/menu.ftl b/user_guides/jpa/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jpa/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jpa/src/main/jbake/templates/page.ftl b/user_guides/jpa/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jpa/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jpa/src/theme/jakartaee-theme.yml b/user_guides/jpa/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jpa/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/jsp/pom.xml b/user_guides/jsp/pom.xml index b75d03b8f9..b3fe39fb10 100644 --- a/user_guides/jsp/pom.xml +++ b/user_guides/jsp/pom.xml @@ -1,8 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.5 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jsp + + jakarta.pages + jakarta.pages-tck-user-guide pom - 3.1.0 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Server Pages for Jakarta EE, Release 3.1 + 4.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Server Pages for Jakarta EE, Release 4.0 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Server-Pages - - Jakarta-Server-Pages-TCK-Users-Guide.pdf - true + DRAFT @@ -54,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - + build-dist + package @@ -96,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/jsp/src/main/jbake/assets/css/style.css b/user_guides/jsp/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jsp/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jsp/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jsp/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jsp/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jsp/src/main/jbake/jbake.properties b/user_guides/jsp/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jsp/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jsp/src/main/jbake/templates/footer.ftl b/user_guides/jsp/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/jsp/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jsp/src/main/jbake/templates/header.ftl b/user_guides/jsp/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jsp/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jsp/src/main/jbake/templates/menu.ftl b/user_guides/jsp/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jsp/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jsp/src/main/jbake/templates/page.ftl b/user_guides/jsp/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jsp/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jsp/src/theme/jakartaee-theme.yml b/user_guides/jsp/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jsp/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/jstl/pom.xml b/user_guides/jstl/pom.xml index 2050190224..e28a4f5dc5 100644 --- a/user_guides/jstl/pom.xml +++ b/user_guides/jstl/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.5 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jstl + + jakarta.jstl + jakarta.jstl-tck-user-guide pom - 3.0.0 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Standard Tag Library for Jakarta EE, Release 3.0 + 3.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Standard Tag Library for Jakarta EE, Release 3.0 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Standard-Tag-Library - - Jakarta-Standard-Tag-Library-TCK-Users-Guide.pdf - true + DRAFT @@ -53,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/jstl/src/main/jbake/assets/css/style.css b/user_guides/jstl/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jstl/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jstl/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jstl/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jstl/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jstl/src/main/jbake/jbake.properties b/user_guides/jstl/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jstl/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jstl/src/main/jbake/templates/footer.ftl b/user_guides/jstl/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/jstl/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jstl/src/main/jbake/templates/header.ftl b/user_guides/jstl/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jstl/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jstl/src/main/jbake/templates/menu.ftl b/user_guides/jstl/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jstl/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jstl/src/main/jbake/templates/page.ftl b/user_guides/jstl/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jstl/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jstl/src/theme/jakartaee-theme.yml b/user_guides/jstl/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jstl/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/jta/pom.xml b/user_guides/jta/pom.xml index f5d7557b89..01451e99ed 100644 --- a/user_guides/jta/pom.xml +++ b/user_guides/jta/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.5 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_jta + + jakarta.transaction + jakarta.transaction-tck-user-guide pom - 2.0.1 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Transactions for Jakarta EE, Release 2.0 + 2.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Transactions for Jakarta EE, Release 2.0 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 + ${project.parent.version} + + Transactions - - Jakarta-Transactions-TCK-Users-Guide.pdf - true + DRAFT @@ -53,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/jta/src/main/jbake/assets/css/style.css b/user_guides/jta/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/jta/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/jta/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/jta/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/jta/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/jta/src/main/jbake/jbake.properties b/user_guides/jta/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/jta/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/jta/src/main/jbake/templates/footer.ftl b/user_guides/jta/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/jta/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/jta/src/main/jbake/templates/header.ftl b/user_guides/jta/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/jta/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/jta/src/main/jbake/templates/menu.ftl b/user_guides/jta/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/jta/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/jta/src/main/jbake/templates/page.ftl b/user_guides/jta/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/jta/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/jta/src/theme/jakartaee-theme.yml b/user_guides/jta/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/jta/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/parent/pom.xml b/user_guides/parent/pom.xml new file mode 100644 index 0000000000..3b61650304 --- /dev/null +++ b/user_guides/parent/pom.xml @@ -0,0 +1,406 @@ + + + + + 4.0.0 + + org.eclipse.ee4j + project + 1.0.9 + + + + jakarta.tck + jakarta.tck.user-guide + pom + 11.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide Parent for TCK Documentation + + + ${project.build.directory}/common-resources + + 11.0.0-SNAPSHOT + ${project.build.directory}/staging + Jakarta-${jakarta.spec.name}-TCK-Users-Guide.pdf + + + DRAFT + + SpecName + + true + true + + + 2.5.11 + 2.3.0 + 3.0.0 + 2.3.13 + 2.7.0-rc.7 + 2.3.32 + + + + ../connector + ../jacc + ../jaxws + ../jms + ../jpa + ../jsp + ../jstl + ../jta + ../saaj + ../websocket + ../../user_guides + + + + package + + + + org.apache.maven.plugins + maven-clean-plugin + 3.3.2 + + + clean-toc + + clean + + none + + + + src/main/jbake/content + + toc.adoc + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.4.1 + + + enforce-versions + + enforce + + none + + + + [17,) + You need JDK17 or newer + + + [3.6.3,) + You need Apache Maven 3.6.3 or newer + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 3.6.0 + + + build-resources + none + + single + + false + + + src/main/assembly/resources.xml + + + + + build-dist + none + + single + + + + ${project.build.commonResourcesDirectory}/assembly/dist.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.1 + + + unpack-resource + none + + unpack + + + + + jakarta.tck + jakarta.tck.user-guide + ${ug.resources.version} + resources + zip + ${project.build.commonResourcesDirectory} + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-resources + none + + copy-resources + + + ${project.build.commonResourcesDirectory}/jbake + + + src/main/jbake + + + + + + + + org.glassfish.doc + glassfish-doc-maven-plugin + 1.3 + + + generate-toc + generate-sources + + toc + + + + [A-C0-9]+\s.*,Preface.*,Part\s.* + + + + + generate-book + generate-sources + + book + + + + + + org.jbake + jbake-maven-plugin + ${jbake.maven.plugin.version} + + + org.asciidoctor + asciidoctorj + ${asciidoctorj.version} + + + org.asciidoctor + asciidoctorj-diagram + ${asciidoctorj.diagram.version} + + + org.freemarker + freemarker + ${freemarker.version} + + + + ${project.build.commonResourcesDirectory}/jbake + ${ug.staging.dir} + + + + build-site + generate-resources + + generate + + + + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctorj.maven.plugin.version} + + + org.asciidoctor + asciidoctorj-pdf + ${asciidoctorj.pdf.version} + + + + ${project.build.directory}/book + book.adoc + + pdf + ${doc.pdf} + + ${ug.staging.dir} + ${project.build.commonResourcesDirectory}/theme + jakartaee + book + ${status} + + + font + + + font + true + + - + true + true + + + + + generate-pdf-doc + none + + process-asciidoc + + + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + 3.2.1 + + + deploy-site + deploy + + publish-scm + + + gh-pages + false + Update site + + + + + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean-toc + clean + + + + + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-versions + validate + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + build-resources + initialize + false + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-resource + generate-resources + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-resources + generate-resources + + + + + + org.apache.maven.plugins + maven-scm-publish-plugin + + + deploy-site + deploy + + + + + + diff --git a/user_guides/parent/src/main/assembly/resources.xml b/user_guides/parent/src/main/assembly/resources.xml new file mode 100644 index 0000000000..ce00bda77f --- /dev/null +++ b/user_guides/parent/src/main/assembly/resources.xml @@ -0,0 +1,40 @@ + + + + + resources + + zip + + false + + + ${project.basedir}/.. + legal + + LICENSE.md + NOTICE.md + + + + ${project.basedir}/src/main/resources + . + + **/* + + + + \ No newline at end of file diff --git a/user_guides/parent/src/main/resources/assembly/dist.xml b/user_guides/parent/src/main/resources/assembly/dist.xml new file mode 100644 index 0000000000..82cfe70cc8 --- /dev/null +++ b/user_guides/parent/src/main/resources/assembly/dist.xml @@ -0,0 +1,41 @@ + + + + + dist + + zip + + false + + + ${project.build.directory}/staging + html + + **/css/* + **/img/* + **/*.html + + + + ${project.build.directory}/generated-docs + pdf + + **/*.pdf + + + + \ No newline at end of file diff --git a/user_guides/connector/src/main/jbake/assets/css/style.css b/user_guides/parent/src/main/resources/jbake/assets/css/style.css similarity index 100% rename from user_guides/connector/src/main/jbake/assets/css/style.css rename to user_guides/parent/src/main/resources/jbake/assets/css/style.css diff --git a/user_guides/connector/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/parent/src/main/resources/jbake/assets/img/eclipse_foundation_logo_tiny.png similarity index 100% rename from user_guides/connector/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png rename to user_guides/parent/src/main/resources/jbake/assets/img/eclipse_foundation_logo_tiny.png diff --git a/user_guides/connector/src/main/jbake/jbake.properties b/user_guides/parent/src/main/resources/jbake/jbake.properties similarity index 100% rename from user_guides/connector/src/main/jbake/jbake.properties rename to user_guides/parent/src/main/resources/jbake/jbake.properties diff --git a/user_guides/parent/src/main/resources/jbake/templates/footer.ftl b/user_guides/parent/src/main/resources/jbake/templates/footer.ftl new file mode 100644 index 0000000000..b15fd99ab3 --- /dev/null +++ b/user_guides/parent/src/main/resources/jbake/templates/footer.ftl @@ -0,0 +1,44 @@ +<#-- a footer template fragment included in the page template --> +
+ + + + + + + + + <#if content.prev??> + + + + <#if content.next??> + + + + + +
+ + + Previous + + + + + Next + + + + + Contents + +
+ + + Eclipse Foundation Logo + Copyright © 2017, 2024 Oracle and/or its affiliates. All rights reserved. + + + + diff --git a/user_guides/parent/src/main/resources/jbake/templates/header.ftl b/user_guides/parent/src/main/resources/jbake/templates/header.ftl new file mode 100644 index 0000000000..963209c948 --- /dev/null +++ b/user_guides/parent/src/main/resources/jbake/templates/header.ftl @@ -0,0 +1,54 @@ + +<#-- a header template fragment included in the page template --> + + + + <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> + + + + + + + + + +
+ ${content.title}
+
+
+ + + + + + + + + <#if content.prev??> + + + + <#if content.next??> + + + + + +
+ + + Previous + + + + + Next + + + + + Contents + +
+ diff --git a/user_guides/connector/src/main/jbake/templates/menu.ftl b/user_guides/parent/src/main/resources/jbake/templates/menu.ftl similarity index 100% rename from user_guides/connector/src/main/jbake/templates/menu.ftl rename to user_guides/parent/src/main/resources/jbake/templates/menu.ftl diff --git a/user_guides/connector/src/main/jbake/templates/page.ftl b/user_guides/parent/src/main/resources/jbake/templates/page.ftl similarity index 100% rename from user_guides/connector/src/main/jbake/templates/page.ftl rename to user_guides/parent/src/main/resources/jbake/templates/page.ftl diff --git a/user_guides/connector/src/theme/jakartaee-theme.yml b/user_guides/parent/src/main/resources/theme/jakartaee-theme.yml similarity index 100% rename from user_guides/connector/src/theme/jakartaee-theme.yml rename to user_guides/parent/src/main/resources/theme/jakartaee-theme.yml diff --git a/user_guides/pom.xml b/user_guides/pom.xml index 07084d71d3..b36ed106cc 100644 --- a/user_guides/pom.xml +++ b/user_guides/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 - - org.eclipse.ee4j - project - 1.0.5 - - org.glassfish - cts_javaee - pom - 11.0.0 - Eclipse Foundation Jakarta EE Platform, Enterprise Edition Test Compatibility Kit User's Guide, Release 11.0 - + 4.0.0 - - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 - - - Jakarta-EE-TCK-Users-Guide.pdf - true - + + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + parent/pom.xml + - - - scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git - - + jakarta.platform + jakarta.jakartaee-tck-user-guide + pom + 11.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta EE Platform, Enterprise Edition, Release 11.0 ${project.version} - - package - - - org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - - - - - - org.glassfish.doc - glassfish-doc-maven-plugin - - - generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - - - - generate-book - generate-resources - - book - - - - - - org.jbake - jbake-maven-plugin - - ${site.output.dir} - - ${status} - - - - - build-site - generate-resources - - generate - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-resources - - process-sources - - copy-resources - - - ${project.build.directory}/book - - - src/main/jbake/assets - - - - - - - - org.asciidoctor - asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - - - - generate-pdf-doc - generate-resources - - process-asciidoc - - - - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - + + ${project.parent.version} - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - - + EE + + DRAFT + + + + + scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + build-dist + package + + + + + org.glassfish.doc + glassfish-doc-maven-plugin + + + generate-toc + generate-sources + + + generate-book + generate-sources + + + + + org.jbake + jbake-maven-plugin + + + build-site + generate-resources + + + + + org.asciidoctor + asciidoctor-maven-plugin + + + generate-pdf-doc + generate-resources + + + + + diff --git a/user_guides/saaj/pom.xml b/user_guides/saaj/pom.xml index ab4d374631..14ce662498 100644 --- a/user_guides/saaj/pom.xml +++ b/user_guides/saaj/pom.xml @@ -1,7 +1,7 @@ - + 4.0.0 + - org.eclipse.ee4j - project - 1.0.7 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_saaj + + jakarta.xml.soap + jakarta.xml.soap-tck-user-guide pom - 3.0.0 - Eclipse Foundation Technology Compatibility Kit User's Guide for SOAP with Attachments API for Jakarta EE, Release 3.0 + 3.0.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta SOAP with Attachments API for Jakarta EE, Release 3.0 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.5.3 - 2.2.1 - 2.2.0 - 1.6.2 - 0.3.3 - 2.3.30 + ${project.parent.version} + + SOAP - - SOAP-Attachments-TCK-Users-Guide.pdf - true + DRAFT scm:git:git@github.com:eclipse-ee4j/jakartaee-tck.git - + - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [11,) - You need Java SE 11 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [A-C0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/saaj/src/main/jbake/assets/css/style.css b/user_guides/saaj/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/saaj/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/saaj/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/saaj/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/saaj/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/saaj/src/main/jbake/jbake.properties b/user_guides/saaj/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/saaj/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/saaj/src/main/jbake/templates/footer.ftl b/user_guides/saaj/src/main/jbake/templates/footer.ftl deleted file mode 100644 index d7ceadf3df..0000000000 --- a/user_guides/saaj/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2022 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/saaj/src/main/jbake/templates/header.ftl b/user_guides/saaj/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/saaj/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/saaj/src/main/jbake/templates/menu.ftl b/user_guides/saaj/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/saaj/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/saaj/src/main/jbake/templates/page.ftl b/user_guides/saaj/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/saaj/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/saaj/src/theme/jakartaee-theme.yml b/user_guides/saaj/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/saaj/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/src/main/jbake/assets/css/style.css b/user_guides/src/main/jbake/assets/css/style.css deleted file mode 100644 index 25a16e472d..0000000000 --- a/user_guides/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,315 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -/* -header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } -*/ - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/src/main/jbake/jbake.properties b/user_guides/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/src/main/jbake/templates/footer.ftl b/user_guides/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/src/main/jbake/templates/header.ftl b/user_guides/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/src/main/jbake/templates/menu.ftl b/user_guides/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/src/main/jbake/templates/page.ftl b/user_guides/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/src/theme/jakartaee-theme.yml b/user_guides/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE diff --git a/user_guides/websocket/pom.xml b/user_guides/websocket/pom.xml index 1eeb0fd223..1cec0f8314 100644 --- a/user_guides/websocket/pom.xml +++ b/user_guides/websocket/pom.xml @@ -1,8 +1,7 @@ - + + 4.0.0 + - org.eclipse.ee4j - project - 1.0.5 + jakarta.tck + jakarta.tck.user-guide + 11.0.0-SNAPSHOT + ../parent/pom.xml - org.glassfish - tck_websocket + + jakarta.websocket + jakarta.websocket-tck-user-guide pom - 2.1.0 - Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta WebSocket for Jakarta EE, Release 2.1 + 2.2.0-SNAPSHOT + Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta WebSocket for Jakarta EE, Release 2.2 ${project.version} - UTF-8 - ${project.build.directory}/staging - true - 2.4.2 - 2.1.0 - 2.1.0 - 1.5.3 - 0.3.3 - 2.3.30 + ${project.parent.version} + + WebSocket - - Jakarta-WebSocket-TCK-Users-Guide.pdf - true + DRAFT @@ -53,39 +49,14 @@ - package org.apache.maven.plugins - maven-clean-plugin - - - - src/main/jbake/content - - toc.adoc - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin + maven-assembly-plugin - enforce-versions - - enforce - - - - - [1.8.0,) - You need JDK8 or newer - - - + build-dist + package @@ -95,164 +66,34 @@ generate-toc - generate-resources - - toc - - - - [0-9]+\s.*,Preface.*,Part\s.* - - + generate-sources generate-book - generate-resources - - book - + generate-sources org.jbake jbake-maven-plugin - - ${site.output.dir} - - ${status} - - build-site generate-resources - - generate - org.asciidoctor asciidoctor-maven-plugin - - ${project.build.directory}/book - book.adoc - - ${project.build.directory}/staging/ - pdf - ${doc.pdf} - - ${project.basedir}/src/theme - jakartaee - book - ${status} - - - font - - - font - true - - - - true - true - - generate-pdf-doc generate-resources - - process-asciidoc - - - org.apache.maven.plugins - maven-scm-publish-plugin - - - deploy-site - deploy - - publish-scm - - - gh-pages - false - Update site - - - - - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.glassfish.doc - glassfish-doc-maven-plugin - 1.3 - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - org.apache.maven.plugins - maven-assembly-plugin - 3.3.0 - - - org.apache.maven.plugins - maven-scm-publish-plugin - 3.1.0 - - - org.jbake - jbake-maven-plugin - ${jbake.maven.plugin.version} - - - org.asciidoctor - asciidoctorj - ${asciidoctorj.version} - - - org.asciidoctor - asciidoctorj-diagram - ${asciidoctorj.diagram.version} - - - org.freemarker - freemarker - ${freemarker.version} - - - - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctorj.maven.plugin.version} - - - org.asciidoctor - asciidoctorj-pdf - ${asciidoctorj.pdf.version} - - - - - + diff --git a/user_guides/websocket/src/main/jbake/assets/css/style.css b/user_guides/websocket/src/main/jbake/assets/css/style.css deleted file mode 100644 index 182f7559b6..0000000000 --- a/user_guides/websocket/src/main/jbake/assets/css/style.css +++ /dev/null @@ -1,313 +0,0 @@ -/* CSS */ -/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ -/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */ -html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ } - -/* HTML5 display definitions ========================================================================== */ -/** Correct `block` display not defined for any HTML5 element in IE 8/9. Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox. Correct `block` display not defined for `main` in IE 11. */ -article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } - -/** 1. Correct `inline-block` display not defined in IE 8/9. 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. */ -audio, canvas, progress, video { display: inline-block; /* 1 */ vertical-align: baseline; /* 2 */ } - -/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */ -audio:not([controls]) { display: none; height: 0; } - -/** Address `[hidden]` styling not present in IE 8/9/10. Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. */ -[hidden], template { display: none; } - -/* Links ========================================================================== */ -/** Remove the gray background color from active links in IE 10. */ -a { background-color: transparent; } - -/** Improve readability when focused and also mouse hovered in all browsers. */ -a:active, a:hover { outline: 0; } - -/* Text-level semantics ========================================================================== */ -/** Address styling not present in IE 8/9/10/11, Safari, and Chrome. */ -abbr[title] { border-bottom: 1px dotted; } - -/** Address style set to `bolder` in Firefox 4+, Safari, and Chrome. */ -b, strong { font-weight: bold; } - -/** Address styling not present in Safari and Chrome. */ -dfn { font-style: italic; } - -/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari, and Chrome. */ -h1 { font-size: 2em; margin: 0.67em 0; } - -/** Address styling not present in IE 8/9. */ -mark { background: #ff0; color: #000; } - -/** Address inconsistent and variable font size in all browsers. */ -small { font-size: 80%; } - -/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */ -sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; } - -sup { top: -0.5em; } - -sub { bottom: -0.25em; } - -/* Embedded content ========================================================================== */ -/** Remove border when inside `a` element in IE 8/9/10. */ -img { border: 0; } - -/** Correct overflow not hidden in IE 9/10/11. */ -svg:not(:root) { overflow: hidden; } - -/* Grouping content ========================================================================== */ -/** Address margin not present in IE 8/9 and Safari. */ -figure { margin: 1em 40px; } - -/** Address differences between Firefox and other browsers. */ -hr { box-sizing: content-box; height: 0; } - -/** Contain overflow in all browsers. */ -pre { overflow: auto; } - -/** Address odd `em`-unit font size rendering in all browsers. */ -code, kbd, pre, samp { font-family: monospace, monospace; font-size: 1em; } - -/* Forms ========================================================================== */ -/** Known limitation: by default, Chrome and Safari on OS X allow very limited styling of `select`, unless a `border` property is set. */ -/** 1. Correct color not being inherited. Known issue: affects color of disabled elements. 2. Correct font properties not being inherited. 3. Address margins set differently in Firefox 4+, Safari, and Chrome. */ -button, input, optgroup, select, textarea { color: inherit; /* 1 */ font: inherit; /* 2 */ margin: 0; /* 3 */ } - -/** Address `overflow` set to `hidden` in IE 8/9/10/11. */ -button { overflow: visible; } - -/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. Correct `select` style inheritance in Firefox. */ -button, select { text-transform: none; } - -/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */ -button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ } - -/** Re-set default cursor for disabled elements. */ -button[disabled], html input[disabled] { cursor: default; } - -/** Remove inner padding and border in Firefox 4+. */ -button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; } - -/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */ -input { line-height: normal; } - -/** It's recommended that you don't attempt to style these elements. Firefox's implementation doesn't respect box-sizing, padding, or width. 1. Address box sizing set to `content-box` in IE 8/9/10. 2. Remove excess padding in IE 8/9/10. */ -input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ } - -/** Fix the cursor style for Chrome's increment/decrement buttons. For certain `font-size` values of the `input`, it causes the cursor style of the decrement button to change from `default` to `text`. */ -input[type="number"]::-webkit-inner-spin-button, input[type="number"]::-webkit-outer-spin-button { height: auto; } - -/** 1. Address `appearance` set to `searchfield` in Safari and Chrome. 2. Address `box-sizing` set to `border-box` in Safari and Chrome (include `-moz` to future-proof). */ -input[type="search"] { -webkit-appearance: textfield; /* 1 */ /* 2 */ box-sizing: content-box; } - -/** Remove inner padding and search cancel button in Safari and Chrome on OS X. Safari (but not Chrome) clips the cancel button when the search input has padding (and `textfield` appearance). */ -input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; } - -/** Define consistent border, margin, and padding. */ -fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; } - -/** 1. Correct `color` not being inherited in IE 8/9/10/11. 2. Remove padding so people aren't caught out if they zero out fieldsets. */ -legend { border: 0; /* 1 */ padding: 0; /* 2 */ } - -/** Remove default vertical scrollbar in IE 8/9/10/11. */ -textarea { overflow: auto; } - -/** Don't inherit the `font-weight` (applied by a rule above). NOTE: the default cannot safely be changed in Chrome and Safari on OS X. */ -optgroup { font-weight: bold; } - -/* Tables ========================================================================== */ -/** Remove most spacing between table cells. */ -table { border-collapse: collapse; border-spacing: 0; } - -td, th { padding: 0; } - -/* LAYOUT STYLES */ - -p { margin-top: 0; } - -code, pre { margin-bottom: 30px; font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace; font-size: 13px; color: #222; } - -code { padding: 0 3px; background-color: #f2f8fc; border: solid 1px #dbe7f3; } - -pre { padding: 20px; overflow: auto; text-shadow: none; background: #fff; border: solid 1px #f2f2f2; } - -pre code { padding: 0; color: #2879d0; background-color: #fff; border: none; } - -ul, ol, dl { margin-bottom: 20px; } - -/* COMMON STYLES */ - -td.halign-right { text-align: right; } - -td.halign-center { text-align: center; } - -form { padding: 20px; background: #f2f2f2; } - -h2 { - font-size: 2em; - line-height: 1.2em; - font-weight: 200; - letter-spacing: 0; -} - -h3 { - font-size: 1.4em; - line-height: 1.2em; - font-weight: normal; - letter-spacing: 0; -} - -.sect1 { - margin-left: 4%; - margin-right: 4%; - font: 13px/20px Arial, Helvetica, sans-serif -} - -a:link { - text-decoration: none; - color: #09569d; -} - -#preamble hr{ - margin-left: 0%; - margin-right: 0%; -} - -#preamble .sectionbody table { - font-weight: 200; - margin-left: 4%; - margin-right: 4%; -} - -hr { - margin-bottom: 12px; -} - -table.tableblock.frame-all.grid-all.spread { - font-size: 12px; -} - -code { - font-size:.9em; - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 3px; - padding: 1px; - padding-left:2px; - padding-right:2px; -} - -pre.prettyprint.highlight { - border: 1px solid #eaeaea; - background-color: #f6f6f6; - border-radius: 4px; - padding: 8px; - padding-top:4px; - padding-bottom:4px; -} - -.language-oac_no_warn { - font-size:.9em; - color:#222; - background-color: transparent; -} - -#doc-title { - margin-left: 4%; -} - -#top-nav { - margin-left: 4%; - font-size: 12px; -} - -#bottom-nav { - margin-left: 4%; - font-size: 12px; -} - -.vector-font { - color:grey; - font-size: 20px; -} - -#copyright { - padding-top: 10px; - padding-bottom: 4px; - display: table; - margin:0 auto; - color: grey; - font-size: 12px; - vertical-align: middle; -} - -.beta {color: #FF0000} - -/* GENERAL ELEMENT TYPE STYLES */ - -/* #Media Queries -================================================== */ -/* Smaller than standard 960 (devices and browsers) */ -/* Tablet Portrait size to standard 960 (devices and browsers) */ -@media only screen and (min-width: 768px) and (max-width: 959px) { .inner { width: 740px; } - header h1, header h2 { width: 340px; } - header h1 { font-size: 60px; } - header h2 { font-size: 30px; } -} -/* All Mobile Sizes (devices and browser) */ -@media only screen and (max-width: 767px) { .inner { width: 93%; } - header { padding: 20px 0; } - header .inner { position: relative; } - header h1, header h2 { width: 100%; } - header h1 { font-size: 48px; } - header h2 { font-size: 24px; } - header a.button { position: relative; display: inline-block; width: auto; height: auto; padding: 5px 10px; margin-top: 15px; font-size: 13px; line-height: 1; color: #2879d0; text-align: center; background-color: #9ddcff; background-image: none; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; } - header a.button small { display: inline; font-size: 13px; } -} -/* Mobile Landscape Size to Tablet Portrait (devices and browsers) */ -/* Mobile Portrait Size to Mobile Landscape Size (devices and browsers) */ - -header h1 { padding-top: 14px; font-size: 2em; font-weight: 200; line-height: 1.4; color: #FFFFFF; letter-spacing: 0px; border-bottom: 0px; } - -header h2 { font-size: 1.2em; margin-top: 0; margin-bottom: 0; font-weight: 200; line-height: .8; color: #ec7D11; letter-spacing: 0; } - -//header a.button { background: transparent url(../images/logo.png) 0 0 no-repeat; padding-left: 32px; } - -header a:hover { text-decoration: none; } - -/* Admonition (Note) block */ -.admonitionblock > table { - border: 0; - background: none; - width: 100%; - table-layout: auto; - margin-bottom: 10.5px; -} -.admonitionblock > table td.icon { - text-align: center; - width: 60px; -} -.admonitionblock > table td.icon img { - max-width: none; -} -.admonitionblock > table td.icon .title { - text-transform: uppercase; -} -.admonitionblock > table td.content { - padding-left: 1em; - padding-right: 1em; - border-left: 3px solid #ddd; -} -.admonitionblock > table td.content > :last-child > :last-child { - margin-bottom: 0; -} -.admonitionblock td.icon [class^="fa icon-"]:before { - font-size: 2.5em; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); - cursor: default; -} -.admonitionblock td.icon .icon-note:before { - content: "\f05a"; - color: #5bc0de; -} diff --git a/user_guides/websocket/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png b/user_guides/websocket/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png deleted file mode 100644 index ee830aeb93..0000000000 Binary files a/user_guides/websocket/src/main/jbake/assets/img/eclipse_foundation_logo_tiny.png and /dev/null differ diff --git a/user_guides/websocket/src/main/jbake/jbake.properties b/user_guides/websocket/src/main/jbake/jbake.properties deleted file mode 100644 index 05c7056f0a..0000000000 --- a/user_guides/websocket/src/main/jbake/jbake.properties +++ /dev/null @@ -1,24 +0,0 @@ -# -# Copyright (c) 2021 Oracle and/or its affiliates. All rights reserved. -# -# This program and the accompanying materials are made available under the -# terms of the Eclipse Public License v. 2.0, which is available at -# http://www.eclipse.org/legal/epl-2.0. -# -# This Source Code may also be made available under the following Secondary -# Licenses when the conditions for such availability set forth in the -# Eclipse Public License v. 2.0 are satisfied: GNU General Public License, -# version 2 with the GNU Classpath Exception, which is available at -# https://www.gnu.org/software/classpath/license.html. -# -# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 -# - -site.host=http://jbake.org -render.tags=false -render.sitemap=false -render.archive=false -render.feed=false -render.index=false -asciidoctor.option.safe=0 -asciidoctor.attributes.export=true \ No newline at end of file diff --git a/user_guides/websocket/src/main/jbake/templates/footer.ftl b/user_guides/websocket/src/main/jbake/templates/footer.ftl deleted file mode 100644 index 746cbf1ccd..0000000000 --- a/user_guides/websocket/src/main/jbake/templates/footer.ftl +++ /dev/null @@ -1,44 +0,0 @@ -<#-- a footer template fragment included in the page template --> -
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- - - Eclipse Foundation Logo  - Copyright © 2017, 2021 Oracle and/or its affiliates. All rights reserved. - - - - diff --git a/user_guides/websocket/src/main/jbake/templates/header.ftl b/user_guides/websocket/src/main/jbake/templates/header.ftl deleted file mode 100644 index 50b72ae8d0..0000000000 --- a/user_guides/websocket/src/main/jbake/templates/header.ftl +++ /dev/null @@ -1,54 +0,0 @@ - -<#-- a header template fragment included in the page template --> - - - - <#if (content.title)??><#escape x as x?xml>${content.title}</#escape></#if> - - - - - - - - - -
- ${content.title}
-
-
- - - - - - - - - <#if content.prev??> - - - - <#if content.next??> - - - - - -
- - - Previous - - - - - Next - - - - - Contents - -
- diff --git a/user_guides/websocket/src/main/jbake/templates/menu.ftl b/user_guides/websocket/src/main/jbake/templates/menu.ftl deleted file mode 100644 index 888c03dcff..0000000000 --- a/user_guides/websocket/src/main/jbake/templates/menu.ftl +++ /dev/null @@ -1 +0,0 @@ -<#-- a menu bar template fragment included in the page template --> \ No newline at end of file diff --git a/user_guides/websocket/src/main/jbake/templates/page.ftl b/user_guides/websocket/src/main/jbake/templates/page.ftl deleted file mode 100644 index eca51db35d..0000000000 --- a/user_guides/websocket/src/main/jbake/templates/page.ftl +++ /dev/null @@ -1,8 +0,0 @@ -<#-- a top level page layout template --> - -<#include "header.ftl"> -<#include "menu.ftl"> - -${content.body} - -<#include "footer.ftl"> \ No newline at end of file diff --git a/user_guides/websocket/src/theme/jakartaee-theme.yml b/user_guides/websocket/src/theme/jakartaee-theme.yml deleted file mode 100644 index 6092a2f5c9..0000000000 --- a/user_guides/websocket/src/theme/jakartaee-theme.yml +++ /dev/null @@ -1,299 +0,0 @@ -# -# Following is the asciidoctor-pdf default theme [1], with small -# customizations, mostly for header and footer, marked "EE". -# -# [1] https://github.com/asciidoctor/asciidoctor-pdf/blob/master/data/themes/default-theme.yml -# -font: - catalog: - # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols - Noto Serif: - normal: notoserif-regular-subset.ttf - bold: notoserif-bold-subset.ttf - italic: notoserif-italic-subset.ttf - bold_italic: notoserif-bold_italic-subset.ttf - # M+ 1mn supports ASCII and the circled numbers used for conums - M+ 1mn: - normal: mplus1mn-regular-ascii-conums.ttf - bold: mplus1mn-bold-ascii.ttf - italic: mplus1mn-italic-ascii.ttf - bold_italic: mplus1mn-bold_italic-ascii.ttf - # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols - # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font - M+ 1p Fallback: - normal: mplus1p-regular-fallback.ttf - bold: mplus1p-regular-fallback.ttf - italic: mplus1p-regular-fallback.ttf - bold_italic: mplus1p-regular-fallback.ttf - fallbacks: - - M+ 1p Fallback -page: - background_color: ffffff - layout: portrait - margin: [0.5in, 0.67in, 0.67in, 0.67in] - # margin_inner and margin_outer keys are used for recto/verso print margins when media=prepress - margin_inner: 0.75in - margin_outer: 0.59in - #size: A4 # EE - size: Letter # EE -base: - align: justify - # color as hex string (leading # is optional) - font_color: 333333 - # color as RGB array - #font_color: [51, 51, 51] - # color as CMYK array (approximated) - #font_color: [0, 0, 0, 0.92] - #font_color: [0, 0, 0, 92%] - font_family: Noto Serif - # choose one of these font_size/line_height_length combinations - #font_size: 14 - #line_height_length: 20 - #font_size: 11.25 - #line_height_length: 18 - #font_size: 11.2 - #line_height_length: 16 - font_size: 10.5 - #line_height_length: 15 - # correct line height for Noto Serif metrics - line_height_length: 12 - #font_size: 11.25 - #line_height_length: 18 - line_height: $base_line_height_length / $base_font_size - font_size_large: round($base_font_size * 1.25) - font_size_small: round($base_font_size * 0.85) - font_size_min: $base_font_size * 0.75 - font_style: normal - border_color: eeeeee - border_radius: 4 - border_width: 0.5 -# FIXME vertical_rhythm is weird; we should think in terms of ems -#vertical_rhythm: $base_line_height_length * 2 / 3 -# correct line height for Noto Serif metrics (comes with built-in line height) -vertical_rhythm: $base_line_height_length -horizontal_rhythm: $base_line_height_length -# QUESTION should vertical_spacing be block_spacing instead? -vertical_spacing: $vertical_rhythm -link: - font_color: 428bca -# literal is currently used for inline monospaced in prose and table cells -literal: - font_color: b12146 - font_family: M+ 1mn -menu_caret_content: " \u203a " -heading: - align: left - #font_color: 181818 - font_color: $base_font_color - font_family: $base_font_family - font_style: bold - # h1 is used for part titles (book doctype) or the doctitle (article doctype) - #h1_font_size: floor($base_font_size * 2.6) # EE - h1_font_size: floor($base_font_size * 2.5) # EE, squeeze title onto one line - # h2 is used for chapter titles (book doctype only) - h2_font_size: floor($base_font_size * 2.15) - h3_font_size: round($base_font_size * 1.7) - h4_font_size: $base_font_size_large - h5_font_size: $base_font_size - h6_font_size: $base_font_size_small - #line_height: 1.4 - # correct line height for Noto Serif metrics (comes with built-in line height) - line_height: 1 - margin_top: $vertical_rhythm * 0.4 - margin_bottom: $vertical_rhythm * 0.9 -title_page: - align: right - logo: - top: 10% - title: - top: 55% - font_size: $heading_h1_font_size - font_color: 999999 - line_height: 0.9 - subtitle: - font_size: $heading_h3_font_size - font_style: bold_italic - line_height: 1 - authors: - margin_top: $base_font_size * 1.25 - font_size: $base_font_size_large - font_color: 181818 - revision: - margin_top: $base_font_size * 1.25 -block: - margin_top: 0 - margin_bottom: $vertical_rhythm -caption: - align: left - font_size: $base_font_size * 0.95 - font_style: italic - # FIXME perhaps set line_height instead of / in addition to margins? - margin_inside: $vertical_rhythm / 3 - #margin_inside: $vertical_rhythm / 4 - margin_outside: 0 -lead: - font_size: $base_font_size_large - line_height: 1.4 -abstract: - font_color: 5c6266 - font_size: $lead_font_size - line_height: $lead_line_height - font_style: italic - first_line_font_style: bold - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -admonition: - column_rule_color: $base_border_color - column_rule_width: $base_border_width - padding: [0, $horizontal_rhythm, 0, $horizontal_rhythm] - #icon: - # tip: - # name: fa-lightbulb-o - # stroke_color: 111111 - # size: 24 - label: - text_transform: uppercase - font_style: bold -blockquote: - font_color: $base_font_color - font_size: $base_font_size_large - border_color: $base_border_color - border_width: 5 - # FIXME disable negative padding bottom once margin collapsing is implemented - padding: [0, $horizontal_rhythm, $block_margin_bottom * -0.75, $horizontal_rhythm + $blockquote_border_width / 2] - cite_font_size: $base_font_size_small - cite_font_color: 999999 -# code is used for source blocks (perhaps change to source or listing?) -code: - font_color: $base_font_color - font_family: $literal_font_family - font_size: ceil($base_font_size) - padding: $code_font_size - line_height: 1.25 - # line_gap is an experimental property to control how a background color is applied to an inline block element - line_gap: 3.8 - background_color: f5f5f5 - border_color: cccccc - border_radius: $base_border_radius - border_width: 0.75 -conum: - font_family: M+ 1mn - font_color: $literal_font_color - font_size: $base_font_size - line_height: 4 / 3 -example: - border_color: $base_border_color - border_radius: $base_border_radius - border_width: 0.75 - background_color: ffffff - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $horizontal_rhythm, 0, $horizontal_rhythm] -image: - align: left -prose: - margin_top: $block_margin_top - margin_bottom: $block_margin_bottom -sidebar: - background_color: eeeeee - border_color: e1e1e1 - border_radius: $base_border_radius - border_width: $base_border_width - # FIXME reenable padding bottom once margin collapsing is implemented - padding: [$vertical_rhythm, $vertical_rhythm * 1.25, 0, $vertical_rhythm * 1.25] - title: - align: center - font_color: $heading_font_color - font_family: $heading_font_family - font_size: $heading_h4_font_size - font_style: $heading_font_style -thematic_break: - border_color: $base_border_color - border_style: solid - border_width: $base_border_width - margin_top: $vertical_rhythm * 0.5 - margin_bottom: $vertical_rhythm * 1.5 -description_list: - term_font_style: bold - term_spacing: $vertical_rhythm / 4 - description_indent: $horizontal_rhythm * 1.25 -outline_list: - indent: $horizontal_rhythm * 1.5 - #marker_font_color: 404040 - # NOTE outline_list_item_spacing applies to list items that do not have complex content - item_spacing: $vertical_rhythm / 2 -table: - background_color: $page_background_color - #head_background_color: - #head_font_color: $base_font_color - head_font_style: bold - #body_background_color: - body_stripe_background_color: f9f9f9 - foot_background_color: f0f0f0 - border_color: dddddd - border_width: $base_border_width - cell_padding: 3 -toc: - indent: $horizontal_rhythm - line_height: 1.4 - dot_leader: - #content: ". " - font_color: a9a9a9 - #levels: 2 3 -# NOTE in addition to footer, header is also supported -footer: - font_size: $base_font_size_small - # NOTE if background_color is set, background and border will span width of page - #border_color: dddddd # EE - #border_width: 0.25 # EE - height: $base_line_height_length * 2.5 - line_height: 1 - padding: [$base_line_height_length / 2, 1, 0, 1] - vertical_align: top - #image_vertical_align: or - # additional attributes for content: - # * {page-count} - # * {page-number} - # * {document-title} - # * {document-subtitle} - # * {chapter-title} - # * {section-title} - # * {section-or-chapter-title} - recto: - #columns: "<50% =0% >50%" - right: - #content: '{page-number}' # EE - #content: '{section-or-chapter-title} | {page-number}' - #content: '{document-title} | {page-number}' - content: '{document-title}{nbsp}{nbsp}{nbsp} *{page-number}*' # EE - #center: - # content: '{page-number}' - left: # EE - content: '{status}' # EE - verso: - #columns: $footer_recto_columns - left: - #content: $footer_recto_right_content # EE - #content: '{page-number} | {chapter-title}' - content: '*{page-number}* {nbsp}{nbsp}{nbsp}{document-title}' # EE - #center: - # content: '{page-number}' - right: # EE - content: '{status}' # EE -header: # EE - font_size: $base_font_size_small # EE - border_color: dddddd # EE - border_width: 0.25 # EE - height: $base_line_height_length * 2.5 # EE - line_height: 1 # EE - padding: [$base_line_height_length / 2, 1, 0, 1] # EE - vertical_align: top # EE - recto: # EE - right: # EE - content: '{section-or-chapter-title}' # EE - verso: # EE - left: # EE - content: '{section-or-chapter-title}' # EE