diff --git a/.github/linters/codespell.txt b/.github/linters/codespell.txt new file mode 100644 index 0000000000..af663ec2af --- /dev/null +++ b/.github/linters/codespell.txt @@ -0,0 +1,40 @@ +abl +activater +afterall +agains +als +ans +bais +bu +cacheing +checkin +childs +compliancy +curren +deleteable +feeded +fo +implementor +implementors +ist +mot +nd +noe +notin +ois +optiona +ore +ot +overriden +precence +resetable +reseted +re-use +seperator +sie +slashs +speakin +splited +splitted +vew +vie diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml new file mode 100644 index 0000000000..ba69906d4a --- /dev/null +++ b/.github/workflows/pre-commit.yml @@ -0,0 +1,47 @@ +# 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 agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +name: Lint + +on: [pull_request] + +permissions: + contents: read + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + pre-commit: + name: Run pre-commit + runs-on: ubuntu-24.04 + steps: + - name: Check Out + uses: actions/checkout@v4 + - name: Install + run: | + python -m pip install --upgrade pip + pip install pre-commit + - name: Set PY + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> "$GITHUB_ENV" + - uses: actions/cache@v3 + with: + path: ~/.cache/pre-commit + key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} + - name: Run pre-commit + run: pre-commit run --all-files diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000000..406df63316 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,37 @@ +# 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 agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +--- +default_stages: [pre-commit, pre-push] +default_language_version: + # force all unspecified Python hooks to run python3 + python: python3 +minimum_pre_commit_version: '3.2.0' +repos: + - repo: meta + hooks: + - id: identity + name: run identity check + - id: check-hooks-apply + name: run check hooks apply + - repo: https://github.com/codespell-project/codespell + rev: v2.4.1 + hooks: + - id: codespell + name: run codespell + description: check spelling with codespell + args: [--ignore-words=.github/linters/codespell.txt] + exclude: ^api/src/main/resources/jakarta/faces/.*$ diff --git a/api/src/client/typescript/faces/test/xhrCore/ResponseTest23.spec.ts b/api/src/client/typescript/faces/test/xhrCore/ResponseTest23.spec.ts index 7b5f72c0c0..88a39d9247 100644 --- a/api/src/client/typescript/faces/test/xhrCore/ResponseTest23.spec.ts +++ b/api/src/client/typescript/faces/test/xhrCore/ResponseTest23.spec.ts @@ -35,7 +35,7 @@ declare var Implementation: any; * response test * the idea is simply to pass in a dom * the context and a response xml and then check what happens - * we do not need to to through the entire ajax cyle for that. + * we do not need to go through the entire ajax cycle for that. */ describe('Tests of the various aspects of the response protocol functionality', function () { diff --git a/api/src/client/typescript/mona_dish/Messaging.ts b/api/src/client/typescript/mona_dish/Messaging.ts index 4371e94013..87352f4c35 100644 --- a/api/src/client/typescript/mona_dish/Messaging.ts +++ b/api/src/client/typescript/mona_dish/Messaging.ts @@ -27,7 +27,7 @@ import {_global$} from "./Global"; /** * generic crypto interface * to encrypt messages before they are sent - * to the message bus oder the underlying bus system + * to the message bus over the underlying bus system * * The idea is to make it as easy as possible, you can use for instance crypto js to * handle everything diff --git a/api/src/client/typescript/mona_dish/SourcesCollectors.ts b/api/src/client/typescript/mona_dish/SourcesCollectors.ts index 167e452798..0e8100bb2c 100644 --- a/api/src/client/typescript/mona_dish/SourcesCollectors.ts +++ b/api/src/client/typescript/mona_dish/SourcesCollectors.ts @@ -47,7 +47,7 @@ export function calculateSkips(next_strm: IStreamDataSource) { * Every data source which feeds data into the lazy stream * or stream generally must implement this interface * - * It is basically an iteratable to the core + * It is basically an iterable to the core */ export interface IStreamDataSource { diff --git a/api/src/main/java/jakarta/faces/component/UIData.java b/api/src/main/java/jakarta/faces/component/UIData.java index 95130aa391..98a5d43685 100644 --- a/api/src/main/java/jakarta/faces/component/UIData.java +++ b/api/src/main/java/jakarta/faces/component/UIData.java @@ -342,7 +342,7 @@ public boolean invokeOnComponent(FacesContext context, String clientId, ContextC } } - // Now Look throught facets on this UIComponent + // Now Look through facets on this UIComponent if (this.getFacetCount() > 0) { for (Iterator it = this.getFacets().values().iterator(); !returnValue && it.hasNext();) diff --git a/api/src/main/resources/META-INF/licenses/dojo-LICENSE.TXT b/api/src/main/resources/META-INF/licenses/dojo-LICENSE.TXT index f18ac7059f..87e3c69809 100644 --- a/api/src/main/resources/META-INF/licenses/dojo-LICENSE.TXT +++ b/api/src/main/resources/META-INF/licenses/dojo-LICENSE.TXT @@ -1,4 +1,4 @@ -Dojo is availble under *either* the terms of the modified BSD license *or* the +Dojo is available under *either* the terms of the modified BSD license *or* the Academic Free License version 2.1. As a recipient of Dojo, you may choose which license to receive this code under (except as noted in per-module LICENSE files). Some modules may not be the copyright of the Dojo Foundation. These diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusResourceHandler.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusResourceHandler.java index 0cbf472fe3..249e8c7fb0 100644 --- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusResourceHandler.java +++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/application/QuarkusResourceHandler.java @@ -30,7 +30,7 @@ /** * Quarkus does not support servletContext.getResourcePaths("/"), which is used for * AUTOMATIC_EXTENSIONLESS_MAPPING. - * Therefor we scan for views on build time and reuse it here. + * Therefore we scan for views on build time and reuse it here. */ public class QuarkusResourceHandler extends ResourceHandlerWrapper { diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java index 34c0a4c020..850a5bfb92 100644 --- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java +++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java @@ -503,7 +503,7 @@ public void handleResourceRequest(FacesContext facesContext) throws IOException return; } - // We neet to get an instance of HttpServletResponse, but sometimes + // We need to get an instance of HttpServletResponse, but sometimes // the response object is wrapped by several instances of // ServletResponseWrapper (like ResponseSwitch). // Since we are handling a resource, we can expect to get an diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java index 5e33b6de53..7bce2fba85 100644 --- a/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java +++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RenderResponseExecutor.java @@ -114,7 +114,7 @@ public boolean execute(FacesContext facesContext) : Level.WARNING; if (log.isLoggable(level)) { - log.log(level, "Cicle over buildView-PreRenderViewEvent on RENDER_RESPONSE phase " + log.log(level, "Circle over buildView-PreRenderViewEvent on RENDER_RESPONSE phase " + "reaches maximal limit, please check listeners for infinite recursion."); } } diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java index 67cd80b91e..4c57d10210 100644 --- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java +++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java @@ -860,7 +860,7 @@ && isFirstUIColumn(parent.getParent(), column)) } // Get the component's renderer. - // Note that getRenderer(FacesContext context) is definded in UIComponent, + // Note that getRenderer(FacesContext context) is defined in UIComponent, // but it is protected, so we have to use reflection! Renderer renderer = null; try @@ -1002,7 +1002,7 @@ && getVisitedFacetCount(context.getFacesContext(), parent) == // remove the visited facet count from the attribute map removeVisitedFacetCount(context.getFacesContext(), parent); - // check for componentes that visit their children multiple times + // check for components that visit their children multiple times if (parent instanceof UIData uidata) { if (uidata.getRowIndex() != uidata.getRowCount() - 1) diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java index 2da044825e..89b2175387 100644 --- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java +++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java @@ -814,7 +814,7 @@ protected void renderOutputLinkStart(FacesContext facesContext, UIOutput output) writer.getCharacterEncoding()); href = hrefBuf.toString(); } - // check for the fragement attribute + // check for the fragment attribute String fragmentAttr = null; if (output instanceof HtmlOutputLink link) { diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java index e3eaac0bb6..f9430df47d 100644 --- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java +++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java @@ -87,7 +87,7 @@ protected boolean hasNewspaperTableSpacer(UIComponent component) /** * @param component dataTable - * @return whether dataTable has newspaper columns layed out horizontally + * @return whether dataTable has newspaper columns laid out horizontally */ protected boolean isNewspaperHorizontalOrientation(UIComponent component) { diff --git a/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java b/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java index e6a80ca4ec..93a0586a04 100644 --- a/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java +++ b/impl/src/main/java/org/apache/myfaces/util/ExternalContextUtils.java @@ -131,8 +131,8 @@ public static HttpServletRequest getHttpServletRequest(ExternalContext ec) } /** - * Trys to obtain a HttpServletResponse from the Response. - * Note that this method also trys to unwrap any ServletResponseWrapper + * Tries to obtain a HttpServletResponse from the Response. + * Note that this method also tries to unwrap any ServletResponseWrapper * in order to retrieve a valid HttpServletResponse. * @param response * @return if found, the HttpServletResponse, null otherwise diff --git a/impl/src/main/java/org/apache/myfaces/util/WebXmlParser.java b/impl/src/main/java/org/apache/myfaces/util/WebXmlParser.java index b123ef6678..8259b29128 100755 --- a/impl/src/main/java/org/apache/myfaces/util/WebXmlParser.java +++ b/impl/src/main/java/org/apache/myfaces/util/WebXmlParser.java @@ -64,7 +64,7 @@ private WebXmlParser() } /** - * Parses the web.xml and web-fragements.xml for error pages. + * Parses the web.xml and web-fragments.xml for error pages. * "null" as key represents the default error page. Otherwise, the key is the exception class. * * @param context the External Context or NULL if checking current classload diff --git a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageStrategy.java b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageStrategy.java index 4e76baa10c..98b1250083 100644 --- a/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageStrategy.java +++ b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageStrategy.java @@ -24,7 +24,7 @@ * This class represents a supported {@link ViewDeclarationLanguage} in the application. Notably, * the default ViewDeclarationLanguageFactory maintains an ordered list of supported languages for * the purpose of determining which one to use for a given view id by calling the {@link #handles} - * method of each ofthe registered support and using the first match. + * method of each of the registered support and using the first match. * * @author Simon Lessard (latest modification by $Author$) * @version $Revision$ $Date$ diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java index 7f7e46ec54..c6ee4c7b92 100644 --- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java +++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java @@ -451,9 +451,9 @@ final static String compressELText(String text) //int firstCharLocation = getFirstTextCharLocationIgnoringSpacesTabsAndCarriageReturn(text); int firstCharLocation = -1; int leftChar = 0; // 0=first char on left 1=\n 2=\r 3=\r\n - int lenght = text.length(); + int length = text.length(); String leftText = null; - for (int j = 0; j < lenght; j++) + for (int j = 0; j < length; j++) { char c = text.charAt(j); if (leftChar == 0) @@ -461,7 +461,7 @@ final static String compressELText(String text) if (c == '\r') { leftChar = 2; - if (j+1 < lenght) + if (j+1 < length) { if (text.charAt(j+1) == '\n') { @@ -486,7 +486,7 @@ final static String compressELText(String text) } if (firstCharLocation == -1) { - firstCharLocation = lenght; + firstCharLocation = length; } // Define the character on the left if (firstCharLocation > 0) @@ -503,7 +503,7 @@ final static String compressELText(String text) leftText = "\r\n"; break; default: - leftText = (lenght > 1) ? text.substring(0,1) : text; + leftText = (length > 1) ? text.substring(0,1) : text; break; } } @@ -584,9 +584,9 @@ else if (ins instanceof LiteralXMLInstruction) { int firstCharLocation = -1; int leftChar = 0; // 0=first char on left 1=\n 2=\r 3=\r\n - int lenght = text.length(); + int length = text.length(); String leftText = null; - for (int j = 0; j < lenght; j++) + for (int j = 0; j < length; j++) { char c = text.charAt(j); if (leftChar == 0) @@ -594,7 +594,7 @@ else if (ins instanceof LiteralXMLInstruction) if (c == '\r') { leftChar = 2; - if (j+1 < lenght) + if (j+1 < length) { if (text.charAt(j+1) == '\n') { @@ -619,7 +619,7 @@ else if (ins instanceof LiteralXMLInstruction) } if (firstCharLocation == -1) { - firstCharLocation = lenght; + firstCharLocation = length; } // Define the character on the left if (firstCharLocation > 0) @@ -636,7 +636,7 @@ else if (ins instanceof LiteralXMLInstruction) leftText = "\r\n"; break; default: - leftText = (lenght > 1) ? text.substring(0,1) : text; + leftText = (length > 1) ? text.substring(0,1) : text; break; } } @@ -645,7 +645,7 @@ else if (ins instanceof LiteralXMLInstruction) leftText = ""; } - if (firstCharLocation == lenght && lenght > 1) + if (firstCharLocation == length && length > 1) { // All the instruction is space, replace with an instruction // with only one space diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java b/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java index c35f3c5a87..df402774a9 100644 --- a/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java +++ b/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java @@ -1605,7 +1605,7 @@ public boolean invokeOnComponent(FacesContext context, String clientId, } } - // Now Look throught facets on this UIComponent + // Now Look through facets on this UIComponent if (this.getFacetCount() > 0) { for (Iterator it = this.getFacets().values().iterator(); !returnValue && it.hasNext();) diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java index 008757d71c..4d99d6bcf3 100644 --- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java +++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/CompositeComponentELUtils.java @@ -69,7 +69,7 @@ public final class CompositeComponentELUtils * - [^\\w\\.\\(] - There must be no word character, dot, or left parenthesis directly before cc.attrs * - cc\\.attrs\\. - "cc.attrs." must occur * - [^\\.]* - There must be no dot after cc.attrs to indicate a method invocation on cc.attrs - * - (\\(.*)? - If there is a left paranthesis after cc.attrs, a dot is allowed again + * - (\\(.*)? - If there is a left parenthesis after cc.attrs, a dot is allowed again */ public static final Pattern CC_ATTRS_METHOD_EXPRESSION_REGEX = Pattern.compile("[^\\(]*[^\\w\\.\\(]cc\\.attrs\\.[^\\.]*(\\(.*)?"); @@ -417,7 +417,7 @@ private static UIComponent lookForCompositeComponentOnStack(final FacesContext f } /** - * Trys to get the composite component using getCompositeComponentBasedOnLocation() + * Tries to get the composite component using getCompositeComponentBasedOnLocation() * and saves it in an attribute on the FacesContext, which is then used by * CompositeComponentImplicitObject. * @param facesContext diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java index 524289c639..2830c65a1f 100644 --- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java +++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DebugPhaseListener.java @@ -132,7 +132,7 @@ public static void createFieldDebugInfo(FacesContext facesContext, newValue = Arrays.deepToString((Object[]) newValue); } - // NOTE that the call stack does not make much sence here + // NOTE that the call stack does not make much sense here // create the debug-info array // structure: diff --git a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java index edd49ebb33..6758070c73 100644 --- a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java +++ b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java @@ -189,7 +189,7 @@ public void initFaces(ServletContext servletContext) if ("false".equals(useEncryption)) { log.warning(StateUtils.USE_ENCRYPTION + " is set to false. " - + "This is unsecure and should only be used for local or intranet applications!"); + + "This is insecure and should only be used for local or intranet applications!"); } else { diff --git a/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_4_1.xsd b/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_4_1.xsd index 543024de3e..6ab95b67e8 100644 --- a/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_4_1.xsd +++ b/impl/src/main/resources/org/apache/myfaces/resource/web-facesconfig_4_1.xsd @@ -1415,7 +1415,7 @@

The "if" element defines a condition that must resolve to true in order for the navigation case on which it is defined to be matched, with the existing match criteria - (action method and outcome) as a prerequiste, if present. + (action method and outcome) as a prerequisite, if present. The condition is defined declaratively using a value expression in the body of this element. The expression is evaluated at the time the navigation case is being matched. diff --git a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java index 2fad3b4330..4e2ad676b5 100644 --- a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java +++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java @@ -807,7 +807,7 @@ public void executeBuildViewCycle(FacesContext facesContext) Level level = production ? Level.FINE : Level.WARNING; if (log.isLoggable(level)) { - log.log(level, "Cicle over buildView-PreRenderViewEvent on RENDER_RESPONSE phase " + log.log(level, "Circle over buildView-PreRenderViewEvent on RENDER_RESPONSE phase " + "reaches maximal limit, please check listeners for infinite recursion."); }*/ } diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java index 51a0ed4259..1c608c2ef4 100644 --- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java +++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/AcidMyFacesRequestTestCase.java @@ -440,7 +440,7 @@ public void testInclude2() throws Exception * <h:panelGroup id="panel" binding="#{componentBindingBean.panel}"> * * The solution is if a binding returns a component that has children or facets - * attached, it is not elegible for PSS algorithm because the additional components + * attached, it is not eligible for PSS algorithm because the additional components * are created outside facelets control, and there is no warrant that the same structure * will be generated across requests, violating PSS base principle (it is possible to * restore to the initial state calling vdl.buildView). diff --git a/integration-tests/ajax/src/main/webapp/scripts/testhelpers.js b/integration-tests/ajax/src/main/webapp/scripts/testhelpers.js index ae6c47dd59..863a608a7e 100644 --- a/integration-tests/ajax/src/main/webapp/scripts/testhelpers.js +++ b/integration-tests/ajax/src/main/webapp/scripts/testhelpers.js @@ -18,19 +18,19 @@ */ /** - * varius helper scripts to ease our testing + * various helper scripts to ease our testing */ /** * /** * ppr emitting function, which encapsules - * faces.ajax.request with additioonal helpers + * faces.ajax.request with additional helpers * * @param source the source item triggering the event * @param event an outer html event object * @param action the action to perform on the jsf side (additional parameter which can be interpreted on the server) * @param formId formName for the issuing form - * @param target the action target (ootional) + * @param target the action target (optional) * @param onError onError handler * @param onEvent onEvent handler */ @@ -101,7 +101,7 @@ var logError = function () { /** * we log our console error output into an array - * to have later referemnces to that one + * to have later references to that one * @type {Array} */ @@ -114,7 +114,7 @@ if (console.error) { } /** - * we add a stanardized reset button to our firsat form to reset the counters + * we add a standardized reset button to our first form to reset the counters */ window.addEventListener("DOMContentLoaded", function () { if (document.body.querySelectorAll("#_reset_all").length == 0) { diff --git a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java index 1cf406e547..1d2c3e9621 100644 --- a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java +++ b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java @@ -118,7 +118,7 @@ public void bar() /* - * MYFACES-4644: Ensure Programmatic Views can be accesssed without extensions + * MYFACES-4644: Ensure Programmatic Views can be accessed without extensions */ @Test public void testExtensionlessProgrammaticView() diff --git a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java index 4372cc4d7c..57a54cb297 100644 --- a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java +++ b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java @@ -156,7 +156,7 @@ public void testPostBackOnNonExactMapping() { webDriver.get(contextPath + "foo"); - // nagivate to non-exact-mapping (bar.xhtml) + // navigate to non-exact-mapping (bar.xhtml) WebElement element = webDriver.findElement(By.id("form:button")); element.click(); diff --git a/parent/src/site/xdoc/release-checklist.xml b/parent/src/site/xdoc/release-checklist.xml index de95b5c64e..3063195e9a 100644 --- a/parent/src/site/xdoc/release-checklist.xml +++ b/parent/src/site/xdoc/release-checklist.xml @@ -355,7 +355,7 @@ mvn site:site # this will generate the site under the target directory

  • Checkout the MyFaces 2.3.x tag to be released from https://github.com/apache/myfaces/tags

    • NOTE: The MyFaces 2.3.x tag is what you want to use to generate the rest of the website if no changes are needed in the development branch (files below).
    - NOTE: If changes are needed in the files below, you have to do modify and commit these changes to the MyFaces 2.3.x development branch (currently the 2.3.x branch in GitHub) in https://github.com/apache/myfaces repository to keep the dev repo up to date. Also consider commiting the files (changes) in the main branch (MyFaces 4.0.x). + NOTE: If changes are needed in the files below, you have to do modify and commit these changes to the MyFaces 2.3.x development branch (currently the 2.3.x branch in GitHub) in https://github.com/apache/myfaces repository to keep the dev repo up to date. Also consider committing the files (changes) in the main branch (MyFaces 4.0.x). 
    diff --git a/pom.xml b/pom.xml
index 21b96d9ba7..87733f6c23 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,7 @@
                         src/main/resources/META-INF/licenses/*-LICENSE.TXT
                         **/src/main/resources/META-INF/services/**
                         .git
+                        .github/linters/codespell.txt
                         .gitignore
                         .vscode/**
                         **/target/**/*
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java
index a9a0eccf75..13ae7e9eea 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java
@@ -299,7 +299,7 @@ protected String title() throws Exception
      *
      * @exception IllegalArgumentException if the context relative path
      *  does not begin with a '/' character
-     * @exception Exception if a different error ocurs
+     * @exception Exception if a different error occurs
      */
     protected URL url(String path) throws Exception
     {