You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/02/28 16:25:07 UTC
[isis] branch master updated: chore: fix case of JavaScript
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 884ce2a chore: fix case of JavaScript
884ce2a is described below
commit 884ce2a6fe6b625c87e9ed9314e62cdafb9b55f2
Author: John Bampton <jb...@gmail.com>
AuthorDate: Sun Feb 28 22:04:06 2021 +1000
chore: fix case of JavaScript
Changed `Javascript` to `JavaScript`
---
.../modules/ROOT/pages/algolia-search.adoc | 6 +--
.../what-is-apache-isis/isis-in-pictures.adoc | 2 +-
.../pages-to-update/ContentNegotiationService.adoc | 2 +-
.../pages-to-update/RepresentationService.adoc | 2 +-
.../pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc | 4 +-
.../modules/fun/partials/_deployment-options.adoc | 2 +-
antora/supplemental-ui/index.html | 2 +-
.../config/pages/sections/isis.viewer.wicket.adoc | 56 +++++++++++-----------
.../apache/isis/core/config/IsisConfiguration.java | 2 +-
core/pom.xml | 2 +-
doxygen.cfg | 2 +-
.../modules/kroviz/pages/DevelopmentGuide.adoc | 38 +++++++--------
.../adoc/modules/starters/pages/helloworld.adoc | 2 +-
.../adoc/modules/starters/pages/simpleapp.adoc | 2 +-
.../adoc/modules/ROOT/pages/ro-spec.adoc | 2 +-
.../other-representations.adoc | 2 +-
.../ROOT/partials/security/user-registration.adoc | 2 +-
.../modules/ROOT/partials/security/web-xml.adoc | 2 +-
.../ROOT/pages/configuration-properties.adoc | 4 +-
.../pages/customisation/custom-javascript.adoc | 4 +-
.../wicket/adoc/modules/ROOT/pages/extending.adoc | 2 +-
.../actionprompt/ActionPromptModalWindow.java | 2 +-
.../components/scalars/XEditableBehaviorWkt.java | 2 +-
.../wicket/ui/errors/ExceptionStackTracePanel.java | 2 +-
.../viewer/wicketapp/IsisWicketApplication.java | 2 +-
25 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc b/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc
index 6cacef6..2091986 100644
--- a/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc
+++ b/antora/components/comguide/modules/ROOT/pages/algolia-search.adoc
@@ -67,9 +67,9 @@ The link:https://github.com/apache/isis-antora[Antora UI bundle] (which defines
There are four steps:
* reference the CSS
-* reference the Javascript
-* set up an input field for the `docsearch` Javascript function to hook into
-* run the `docsearch` Javascript function on page load
+* reference the JavaScript
+* set up an input field for the `docsearch` JavaScript function to hook into
+* run the `docsearch` JavaScript function on page load
These are fully described in the link:https://docsearch.algolia.com/docs/dropdown[Algolia docs].
There are other options for styling, see link:https://docsearch.algolia.com/docs/styling/[here].
diff --git a/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc b/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
index 26c1860..c4a89a1 100644
--- a/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
+++ b/antora/components/docs/modules/ROOT/pages/what-is-apache-isis/isis-in-pictures.adoc
@@ -196,7 +196,7 @@ image::what-is-apache-isis/isis-in-pictures/190-switch-theme.png[width="800px"]
== REST API
In addition to Apache Isis' Wicket viewer, it also provides a rich REST API with a full set of hypermedia controls, generated automatically from the domain objects (entities and view models).
-The framework provides two default representations, one an implementation of the http://restfulobjects.org[Restful Objects] spec, the other a simplified representation suitable for custom Javascript apps.
+The framework provides two default representations, one an implementation of the http://restfulobjects.org[Restful Objects] spec, the other a simplified representation suitable for custom JavaScript apps.
Other representations can be plugged in.
The screenshot below shows accessing the Restful Objects representation API accessed through a Chrome plugin:
diff --git a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ContentNegotiationService.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ContentNegotiationService.adoc
index 4584f26..777d939 100644
--- a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ContentNegotiationService.adoc
+++ b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/ContentNegotiationService.adoc
@@ -8,7 +8,7 @@ WARNING: TODO: this content has not yet been reviewed/updated for v2.0
The `ContentNegotiationService` is a plug-in point for the xref:vro:ROOT:about.adoc[RestfulObjects viewer] so that it can generate representations according to HTTP `Accept` header of the request. This idea is discussed in section 34.1 of the link:http://restfulobjects.org[Restful Objects spec] v1.0.
-The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.
+The principal motivation is to allow more flexible representations to be generated for REST clients that (perhaps through their use of a certain JavaScript library, say) expect, or at least works best with, a certain style of representation.
Another use case is to support "third party" REST clients over which you have no control. In this scenario you _must not_ naively expose entities through the RO viewer, because over time those entities will inevitably evolve and change their structure. If the entities were exposed directly then those REST clients will break.
diff --git a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/RepresentationService.adoc b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/RepresentationService.adoc
index 42746ad..5b451d0 100644
--- a/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/RepresentationService.adoc
+++ b/antora/components/refguide-index/modules/core/pages/index/runtimeservices/hooks/pages-to-update/RepresentationService.adoc
@@ -9,7 +9,7 @@ The `RepresentationService` is the main plug-in point for the xref:vro:ROOT:abou
The default implementations ultimately generate representations according to the link:http://restfulobjects.org[Restful Objects spec] v1.0.
However, it also delegates to the xref:core:runtime-services:ContentNegotiationService.adoc[ContentNegotiationService] which provides a mechanism for altering representations according to the HTTP `Accept` header.
-This allows more flexible representations to be generated for REST clients that (perhaps through their use of a certain Javascript library, say) expect, or at least works best with, a certain style of representation.
+This allows more flexible representations to be generated for REST clients that (perhaps through their use of a certain JavaScript library, say) expect, or at least works best with, a certain style of representation.
In all there are three domain services that can influence the representations generated: this service, xref:core:runtime-services:ContentNegotiationService.adoc[ContentNegotiationService] and the xref:refguide:applib:index/services/conmap/ContentMappingService.adoc[ContentMappingService].
The diagram below shows how these collaborate:
diff --git a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc
index 9c18943..3454b3e 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2020/2.0.0-M3/migrating-to-2.0.0.adoc
@@ -760,7 +760,7 @@ Experimental feature to allow for submission of background-tasks, that themselve
To make this work we introduce following components:
- A SSE Servlet listening on '/sse' for client requests.
-- Client-Side Javascript that can subscribe 'EventStream's to the SSE Servlet
+- Client-Side JavaScript that can subscribe 'EventStream's to the SSE Servlet
- An EventStreamSource interface for any designated background task to implement.
- An EventStreamService, that allows for such EventStreamSource objects to be submitted for execution on a thread-pool.
- An EventStreamSource is associated with an EventStream on which it may fire update events.
@@ -1192,7 +1192,7 @@ We do now provide JAXB XmlAdapters for Java built-in temporal types in 'applib':
=== Wicket-Viewer
-Instead of browser built-in tooltip rendering, the framework now provides tooltips using Javascript and CSS, currently with following stylesheet defaults:
+Instead of browser built-in tooltip rendering, the framework now provides tooltips using JavaScript and CSS, currently with following stylesheet defaults:
----
.ui-tooltip {
diff --git a/antora/components/userguide/modules/fun/partials/_deployment-options.adoc b/antora/components/userguide/modules/fun/partials/_deployment-options.adoc
index c1caa37..c8ebb4f 100644
--- a/antora/components/userguide/modules/fun/partials/_deployment-options.adoc
+++ b/antora/components/userguide/modules/fun/partials/_deployment-options.adoc
@@ -45,7 +45,7 @@ There are three main use cases for deploying Apache Isis as a RESTful web servic
* to allow a custom UI to be built against the RESTful API
+
-For example, using a Javascript framework such as Angular/Ionic/ReactJs/Vue etc, or JavaFX
+For example, using a JavaScript framework such as Angular/Ionic/ReactJs/Vue etc, or JavaFX
* to enable integration between systems
+
diff --git a/antora/supplemental-ui/index.html b/antora/supplemental-ui/index.html
index d29255f..7cebec8 100644
--- a/antora/supplemental-ui/index.html
+++ b/antora/supplemental-ui/index.html
@@ -944,7 +944,7 @@ mvn -pl webapp jetty:run</pre>
})
</script>
-<!-- Template Main Javascript File -->
+<!-- Template Main JavaScript File -->
<script src="_/js/home/main.js"></script>
</body>
diff --git a/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc b/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc
index bd7ce2a..7eb5066 100644
--- a/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc
+++ b/core/config/src/main/adoc/modules/config/pages/sections/isis.viewer.wicket.adoc
@@ -15,7 +15,7 @@ include::../section-hooks/isis.viewer.wicket~pre.adoc[]
[[isis.viewer.wicket.ajax-debug-mode]]
isis.viewer.wicket.ajax-debug-mode
-|
+|
| Whether the Ajax debug should be shown, by default this is disabled.
@@ -36,7 +36,7 @@ There is usually very little reason to change this from its default.
isis.viewer.wicket.application. +
about
-|
+|
| Label used on the about page.
@@ -45,7 +45,7 @@ about
isis.viewer.wicket.application. +
brand-logo-header
-|
+|
| Either the location of the image file (relative to the class-path resource root), or an absolute URL.
This is rendered on the header panel. An image with a size of 160x40 works well. If not specified, the application.name is used instead.
@@ -56,7 +56,7 @@ This is rendered on the header panel. An image with a size of 160x40 works well.
isis.viewer.wicket.application. +
brand-logo-signin
-|
+|
| Either the location of the image file (relative to the class-path resource root), or an absolute URL.
This is rendered on the sign-in page. An image with a size of 400x40 works well. If not specified, the application name is used instead.
@@ -66,7 +66,7 @@ This is rendered on the sign-in page. An image with a size of 400x40 works well.
[[isis.viewer.wicket.application.css]]
isis.viewer.wicket.application.css
-|
+|
| URL of file to read any custom CSS, relative to ``static`` package on the class path.
A typical value is ``css``. This will result in this file being read from the ``static/css`` directory (because static resources such as CSS are mounted by Spring by default under ``static`` package).
@@ -77,7 +77,7 @@ A typical value is ``css``. This will result in this file being read from the ``
isis.viewer.wicket.application. +
favicon-content-type
-|
+|
| Specifies the content type of the favIcon, if any.
@@ -86,7 +86,7 @@ favicon-content-type
isis.viewer.wicket.application. +
favicon-url
-|
+|
| Specifies the URL to use of the favIcon.
This is expected to be a local resource.
@@ -96,8 +96,8 @@ This is expected to be a local resource.
[[isis.viewer.wicket.application.js]]
isis.viewer.wicket.application.js
-|
-| URL of file to read any custom Javascript, relative to ``static`` package on the class path.
+|
+| URL of file to read any custom JavaScript, relative to ``static`` package on the class path.
A typical value is ``js``. This will result in this file being read from the ``static/js`` directory (because static resources such as CSS are mounted by Spring by default under ``static`` package).
@@ -127,7 +127,7 @@ name
isis.viewer.wicket.application. +
version
-|
+|
| The version of the application, eg 1.0, 1.1, etc.
If present, then this will be shown in the footer on every page as well as on the about page.
@@ -194,7 +194,7 @@ max-parent-chain-length
isis.viewer.wicket. +
clear-original-destination
-|
+|
| If the end user uses a deep link to access the Wicket viewer, but is not authenticated, then this configuration property determines whether to continue through to that original destination once authenticated, or simply to go to the home page.
The default behaviour is to honour the original destination requested.
@@ -204,7 +204,7 @@ The default behaviour is to honour the original destination requested.
[[isis.viewer.wicket.credit]]
isis.viewer.wicket.credit
-|
+|
| List of organisations or individuals to give credit to, shown as links and icons in the footer. A maximum of 3 credits can be specified.
IntelliJ unfortunately does not provide IDE completion for lists of classes; YMMV.
@@ -260,7 +260,7 @@ Each Date scalar panel will use ``#getDatePattern()`` or ``#getDateTimePattern()
isis.viewer.wicket. +
development-utilities.enable
-|
+|
| Determines whether debug bar and other stuff influenced by ``DebugSettings#isDevelopmentUtilitiesEnabled()`` is enabled or not.
By default, depends on the mode (prototyping = enabled, server = disabled). This property acts as an override.
@@ -270,7 +270,7 @@ By default, depends on the mode (prototyping = enabled, server = disabled). This
[[isis.viewer.wicket.dialog-mode]]
isis.viewer.wicket.dialog-mode
-|
+|
| Whether the dialog mode rendered when invoking actions on domain objects should be to use the sidebar (the default) or to use a modal dialog.
This can be overridden on a case-by-case basis using ``ActionLayout#promptStyle()``.
@@ -281,7 +281,7 @@ This can be overridden on a case-by-case basis using ``ActionLayout#promptStyle(
isis.viewer.wicket. +
dialog-mode-for-menu
-|
+|
| Whether the dialog mode rendered when invoking actions on domain services (that is, menus) should be to use a modal dialog (the default) or to use the sidebar panel.
This can be overridden on a case-by-case basis using ``ActionLayout#promptStyle()``.
@@ -291,7 +291,7 @@ This can be overridden on a case-by-case basis using ``ActionLayout#promptStyle(
[[isis.viewer.wicket.live-reload-url]]
isis.viewer.wicket.live-reload-url
-|
+|
| If specified, then is rendered on each page to enable live reload.
Configuring live reload also requires an appropriate plugin to the web browser (eg see http://livereload.com/[livereload.com] and a mechanism to trigger changes, eg by watching ``xml`` files.
@@ -303,7 +303,7 @@ isis.viewer.wicket. +
max-title-length-in-parented- +
tables
-|
+|
| null
@@ -313,7 +313,7 @@ isis.viewer.wicket. +
max-title-length-in-standalone- +
tables
-|
+|
| null
@@ -354,7 +354,7 @@ This behaviour is enabled by default, but can be disabled using this flag.
[[isis.viewer.wicket.prompt-style]]
isis.viewer.wicket.prompt-style
-|
+|
| Whether to use a modal dialog for property edits and for actions associated with properties.
This can be overridden on a case-by-case basis using ``@PropertyLayout#promptStyle`` and ``@ActionLayout#promptStyle``.
@@ -367,7 +367,7 @@ This behaviour is disabled by default; the viewer will use an inline prompt in t
isis.viewer.wicket. +
redirect-even-if-same-object
-|
+|
| Whether to redirect to a new page, even if the object being shown (after an action invocation or a property edit) is the same as the previous page.
This behaviour is disabled by default; the viewer will update the existing page if it can, making for a smoother user experience. If enabled then this reinstates the pre-1.15.0 behaviour of redirecting in all cases.
@@ -387,7 +387,7 @@ cookie-key
isis.viewer.wicket.remember-me. +
encryption-key
-|
+|
| If the "remember me" feature is available, optionally specifies an encryption key (a complex string acting as salt to the encryption algorithm) for computing the encrypted credentials.
If not set, then (in production mode) the Wicket viewer will compute a random key each time it is started. This will mean that any credentials stored between sessions will become invalid.
@@ -402,7 +402,7 @@ In prototype mode this setting is effectively ignored, because the same key will
isis.viewer.wicket.remember-me. +
suppress
-|
+|
| Whether the sign-in page should have a "remember me" link (the default), or if it should be suppressed.
If "remember me" is available and checked, then the viewer will allow users to login based on encrypted credentials stored in a cookie. An encryption key can optionally be specified.
@@ -446,7 +446,7 @@ By default this is enabled, in other words Wicket tags are stripped. Please be a
isis.viewer.wicket. +
suppress-password-reset
-|
+|
| Whether to suppress the password reset link on the sign-in page.
Although this is disabled by default (in other words the 'reset password' link is not suppressed), note that in addition the application must provide an implementation of the ``UserRegistrationService`` as well as a configured ``EmailNotificationService`` (same conditions as for the ``#isSuppressSignUp()`` sign-up link).
@@ -457,7 +457,7 @@ Although this is disabled by default (in other words the 'reset password' link i
isis.viewer.wicket. +
suppress-sign-up
-|
+|
| Whether to suppress the sign-up link on the sign-in page.
Although this is disabled by default (in other words the sign-up link is not suppressed), note that in addition the application must provide an implementation of the ``UserRegistrationService`` as well as a configured ``EmailNotificationService`` (same conditions as for the ``#isSuppressPasswordReset()`` password reset link).
@@ -467,7 +467,7 @@ Although this is disabled by default (in other words the sign-up link is not sup
[[isis.viewer.wicket.themes.enabled]]
isis.viewer.wicket.themes.enabled
-|
+|
| A comma separated list of enabled theme names, as defined by https://bootswatch.com.
@@ -496,7 +496,7 @@ IsisWicketThemeSupportDefault
isis.viewer.wicket.themes. +
show-chooser
-|
+|
| Whether the theme chooser widget should be available in the footer.
@@ -526,7 +526,7 @@ This behaviour is enabled by default.
[[isis.viewer.wicket.welcome.text]]
isis.viewer.wicket.welcome.text
-|
+|
| Text to be displayed on the application’s home page, used as a fallback if welcome.file is not specified. If a @HomePage action exists, then that will take precedence.
@@ -535,7 +535,7 @@ isis.viewer.wicket.welcome.text
isis.viewer.wicket. +
wicket-source-plugin
-|
+|
| Whether the Wicket source plugin should be enabled; if so, the markup includes links to the Wicket source.
This behaviour is disabled by default. Please be aware that enabloing it can substantially impact performance.
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 21d6101..8d0a6c7 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -2178,7 +2178,7 @@ public class IsisConfiguration {
/**
*/
/**
- * URL of file to read any custom Javascript, relative to <code>static</code> package on the class path.
+ * URL of file to read any custom JavaScript, relative to <code>static</code> package on the class path.
*
* <p>
* A typical value is <code>js/application.js</code>. This will result in this file being read
diff --git a/core/pom.xml b/core/pom.xml
index 7714ccd..2696161 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -58,7 +58,7 @@
<pmd.ruleset>${coreBaseDir}/codequality/pmd.xml</pmd.ruleset>
<license.additional-notes>In addition, Apache Isis uses some
- Javascript libraries:
+ JavaScript libraries:
* Twitter Bootstrap, licensed under MIT [1]
*
diff --git a/doxygen.cfg b/doxygen.cfg
index 13124f1..a3d80db 100644
--- a/doxygen.cfg
+++ b/doxygen.cfg
@@ -228,7 +228,7 @@ OPTIMIZE_OUTPUT_VHDL = NO
# With this tag you can assign which parser to use for a given extension.
# Doxygen has a built-in mapping, but you can override or extend it using this tag.
# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
+# the parsers supported by doxygen: IDL, Java, JavaScript, C#, C, C++, D, PHP,
# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
# use: inc=Fortran f=C
diff --git a/incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc b/incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc
index 5027cfd..63ba180 100644
--- a/incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc
+++ b/incubator/clients/kroviz/adoc/modules/kroviz/pages/DevelopmentGuide.adoc
@@ -36,7 +36,7 @@ Alternatively you can eg. in IntelliJ a Run/Debug Configuration:
image::kroviz_Run_Debug_Configuration.png[Preview]
----
- npm --verbose
+ npm --verbose
----
If task npm-install hangs, try
@@ -61,7 +61,7 @@ gradlew.bat -t run
== Design
-In the following section you'll find information that likely helps understanding the implementation.
+In the following section you'll find information that likely helps understanding the implementation.
=== Overview
@@ -132,7 +132,7 @@ The Restful Objects API.
Thanks to Kotlin, code is very compact and readable.
And, since Kotlin is a typed language and IDE's can infer a lot about the code, there are only few surprises.
-Nevertheless Kotlin/JS allows to use Javascript features along side the typed part, what effectively makes it a dynamic language.
+Nevertheless Kotlin/JS allows to use JavaScript features along side the typed part, what effectively makes it a dynamic language.
=== Hot Spots
@@ -281,8 +281,8 @@ mvn archetype:generate \
-D archetypeGroupId=org.apache.isis.archetype \
-D archetypeArtifactId=simpleapp-archetype \
-D archetypeVersion=2.0.0-M3 \
- -D groupId=org.my \
- -D artifactId=myapp-2.0.0-M3 \
+ -D groupId=org.my \
+ -D artifactId=myapp-2.0.0-M3 \
-D version=1.0.0 -B
----
@@ -298,7 +298,7 @@ mvn clean install -DskipTests
[source,bash]
----
cd webapp
-mvn -Djetty.port=8080 jetty:run -DPROTOTYPING
+mvn -Djetty.port=8080 jetty:run -DPROTOTYPING
----
== Appendix
@@ -308,19 +308,19 @@ mvn -Djetty.port=8080 jetty:run -DPROTOTYPING
See: elp.kapowsoftware.com/9.4/index.jsp?topic=/doc/rm/JSONTerminology.html
|===
-| |
-
-|JSON Text |JSON Object | JSON Array
-|JSON Object |{} | { Properties }
-|JSON Array |[] | [ Items ]
-|Properties |Property, Properties
-|Property |String : JSON Value
-|Items |JSON Value, Items
-|JSON Value |JSON Text | String | Number | false | null | true
+| |
+
+|JSON Text |JSON Object | JSON Array
+|JSON Object |{} | { Properties }
+|JSON Array |[] | [ Items ]
+|Properties |Property, Properties
+|Property |String : JSON Value
+|Items |JSON Value, Items
+|JSON Value |JSON Text | String | Number | false | null | true
|String |"" | " Characters " |
| Characters | Character Characters |
-| Character | any Unicode character except ", \ or control character | " | \ | \/ | \b | \f | \n | \r | \t | \u 4 hex digits
-|Number |a number very much like a C or Java number, see RFC 4627 for details.
+| Character | any Unicode character except ", \ or control character | " | \ | \/ | \b | \f | \n | \r | \t | \u 4 hex digits
+|Number |a number very much like a C or Java number, see RFC 4627 for details.
|===
=== CORS
@@ -381,7 +381,7 @@ Put into webapp/src/main/webapp/WEB-INF/lib:
==== Solution 3:
- Incorporate kroviz.js eg. in the WAR containing your Apache Isis backend.
+ Incorporate kroviz.js eg. in the WAR containing your Apache Isis backend.
== Extensions
@@ -393,4 +393,4 @@ Put into webapp/src/main/webapp/WEB-INF/lib:
=== Chart.js
-* SanKey diagarms, see CodePen example
\ No newline at end of file
+* SanKey diagarms, see CodePen example
diff --git a/starters/adoc/modules/starters/pages/helloworld.adoc b/starters/adoc/modules/starters/pages/helloworld.adoc
index 3ec8920..364519f 100644
--- a/starters/adoc/modules/starters/pages/helloworld.adoc
+++ b/starters/adoc/modules/starters/pages/helloworld.adoc
@@ -413,7 +413,7 @@ In a production application this is usually replaced with a page that does an HT
The pages generated by the Wicket viewer have plenty of CSS classes to target.
You can also implement the `cssClass()` method in each domain object to provide additional CSS classes to target.
-* Similarly, in `scripts/application.js` you have the option to add arbitrary Javascript.
+* Similarly, in `scripts/application.js` you have the option to add arbitrary JavaScript.
JQuery is available by default.
=== No src/main/webapp
diff --git a/starters/adoc/modules/starters/pages/simpleapp.adoc b/starters/adoc/modules/starters/pages/simpleapp.adoc
index 6d7385a..d23013a 100644
--- a/starters/adoc/modules/starters/pages/simpleapp.adoc
+++ b/starters/adoc/modules/starters/pages/simpleapp.adoc
@@ -764,7 +764,7 @@ In a production application this is usually replaced with a page that does an HT
The pages generated by the Wicket viewer have plenty of CSS classes to target.
You can also implement the `cssClass()` method in each domain object to provide additional CSS classes to target.
-* Similarly, in `scripts/application.js` you have the option to add arbitrary Javascript.
+* Similarly, in `scripts/application.js` you have the option to add arbitrary JavaScript.
JQuery is available by default.
=== No src/main/webapp
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
index 9d094db..43fb3fd 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/ro-spec.adoc
@@ -11,7 +11,7 @@ The Restful Objects spec can be downloaded from link:http://restfulobjects.org[h
== Goals of the Spec
The goal of Restful Objects is to allow domain models to be accessed through HTTP resources, returning a set of JSON representations.
-These representations can then be consumed by any client (e.g. Javascript, Java, .NET, Ruby, Python).
+These representations can then be consumed by any client (e.g. JavaScript, Java, .NET, Ruby, Python).
Both the resources and representations are generalized so that they can be applied to any domain model, and by default all representations have media types designed to allow a completely generic client to be written, capable of working, unmodified, with any domain model that has a Restful Objects interface.
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
index 745ca79..6aefdda 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/simplified-representations/other-representations.adoc
@@ -6,7 +6,7 @@
Sometimes though you may want to extend or change the representations generated. This might be because you want to
-write a RESTful client that uses a particular library (say a Javascript library or web components) that can only handle representations in a certain form.
+write a RESTful client that uses a particular library (say a JavaScript library or web components) that can only handle representations in a certain form.
Or, you might want to have Apache Isis generate representations according to some other "standard", of which there are
many:
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/partials/security/user-registration.adoc b/viewers/restfulobjects/adoc/modules/ROOT/partials/security/user-registration.adoc
index 776a59d..a016cee 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/partials/security/user-registration.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/partials/security/user-registration.adoc
@@ -64,7 +64,7 @@ The strategy is configured in `web.xml`; for example:
</filter>
----
<1> configure basic auth strategy
-<2> what to do if no session was found; we use `auto` so as to issue a 401 status code with basic authentication challenge if the request originated from a web browser. (Prior to `1.11.0` this parameter was set either to `basicAuthChallenge` (which works when requested from web browser) or to `unauthorized` (which works when requested from a suitably coded custom Javascript app).
+<2> what to do if no session was found; we use `auto` so as to issue a 401 status code with basic authentication challenge if the request originated from a web browser. (Prior to `1.11.0` this parameter was set either to `basicAuthChallenge` (which works when requested from web browser) or to `unauthorized` (which works when requested from a suitably coded custom JavaScript app).
<3> which paths are allowed to be accessed directly, without a session. The `/restful/swagger` path provides access to the SwaggerResource that dynamically generates swagger schema definition files from the Apache Isis metamodel.
diff --git a/viewers/restfulobjects/adoc/modules/ROOT/partials/security/web-xml.adoc b/viewers/restfulobjects/adoc/modules/ROOT/partials/security/web-xml.adoc
index b215d7e..bb9a2f7 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/partials/security/web-xml.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/partials/security/web-xml.adoc
@@ -64,7 +64,7 @@ The strategy is configured in `web.xml`; for example:
</filter>
----
<1> configure basic auth strategy
-<2> what to do if no session was found; we use `auto` so as to issue a 401 status code with basic authentication challenge if the request originated from a web browser. (Prior to `1.11.0` this parameter was set either to `basicAuthChallenge` (which works when requested from web browser) or to `unauthorized` (which works when requested from a suitably coded custom Javascript app).
+<2> what to do if no session was found; we use `auto` so as to issue a 401 status code with basic authentication challenge if the request originated from a web browser. (Prior to `1.11.0` this parameter was set either to `basicAuthChallenge` (which works when requested from web browser) or to `unauthorized` (which works when requested from a suitably coded custom JavaScript app).
<3> which paths are allowed to be accessed directly, without a session. The `/restful/swagger` path provides access to the SwaggerResource that dynamically generates swagger schema definition files from the Apache Isis metamodel.
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
index 16177f9..0abc426 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/configuration-properties.adoc
@@ -53,7 +53,7 @@ The xref:refguide:config:about.adoc[Configuration Guide] includes a xref:refguid
//
//Configuration properties that identify the application, in the sign-in page, welcome and about pages.
//
-//These also include top-level overrides for CSS and Javascript.
+//These also include top-level overrides for CSS and JavaScript.
//
//.Application Identity
//[cols="2a,1,3a", options="header"]
@@ -103,7 +103,7 @@ The xref:refguide:config:about.adoc[Configuration Guide] includes a xref:refguid
//`application.js`
//|File name +
//(_`scripts/application.js`_)
-//|File to read any custom Javascript, relative to `src/main/webapp` directory.
+//|File to read any custom JavaScript, relative to `src/main/webapp` directory.
//
//|`isis.viewer.wicket.` +
//`application.name`
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc b/viewers/wicket/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
index e533ec0..ae9a7e7 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/customisation/custom-javascript.adoc
@@ -1,5 +1,5 @@
[[custom-javascript]]
-= Custom Javascript
+= Custom JavaScript
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
@@ -7,7 +7,7 @@
The Wicket viewer ships with embedded JQuery, so this can be leveraged, for example to perform arbitrary transformations of the rendered page on page load.
-To register your Javascript code, then just specify the appropriate configuration property:
+To register your JavaScript code, then just specify the appropriate configuration property:
[source,properties]
diff --git a/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc b/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
index 238c30b..40c2c56 100644
--- a/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
+++ b/viewers/wicket/adoc/modules/ROOT/pages/extending.adoc
@@ -9,7 +9,7 @@ The Wicket viewer allows you to customize the GUI in several (progressively more
* the xref:vw:ROOT:customisation.adoc[customisation] chapter described:
** by xref:vw:ROOT:customisation.adoc#tweaking-css-classes[tweaking the UI using CSS]
-** by xref:vw:ROOT:customisation.adoc#custom-javascript[tweaking the UI using Javascript]
+** by xref:vw:ROOT:customisation.adoc#custom-javascript[tweaking the UI using JavaScript]
* in this chapter we have a number of heavier-weight approaches:
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
index 7dcb805..55ae9f1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
@@ -52,7 +52,7 @@ public class ActionPromptModalWindow extends ModalDialog<Void> {
// the default implementation seems to make its two calls in the wrong order, in particular with
// appendDisableEnforceFocus called after the modal javascript object has already been created.
- // so this patch makes sure it is called before hand. This results in the Javascript fragment being
+ // so this patch makes sure it is called before hand. This results in the JavaScript fragment being
// invoked twice, but what the hey.
appendDisableEnforceFocus(target);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java
index df486fd..b319274 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/XEditableBehaviorWkt.java
@@ -61,7 +61,7 @@ public class XEditableBehaviorWkt extends XEditableBehavior {
private static final long serialVersionUID = 1L;
/**
- * what's bound to "validate" event in Javascript, and sent to the server
+ * what's bound to "validate" event in JavaScript, and sent to the server
*/
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
index de8129e..9ae3d50 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/ExceptionStackTracePanel.java
@@ -92,7 +92,7 @@ public class ExceptionStackTracePanel extends Panel {
final Label label = new Label(ID_MAIN_MESSAGE, mainMessage);
// to avoid potential XSS attacks, no longer escape model strings
- // (risk is low but could just happen: error message being rendered might accidentally or deliberately contain rogue Javascript)
+ // (risk is low but could just happen: error message being rendered might accidentally or deliberately contain rogue JavaScript)
// label.setEscapeModelStrings(false);
add(label);
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
index 4c3183b..24df384 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/IsisWicketApplication.java
@@ -476,7 +476,7 @@ implements
// //////////////////////////////////////
/**
- * filters Javascript header contributions so rendered to bottom of page.
+ * filters JavaScript header contributions so rendered to bottom of page.
*
* <p>
* Factored out for easy (informal) pluggability.