diff --git a/modules/distribution/product/src/main/assembly/filter.properties b/modules/distribution/product/src/main/assembly/filter.properties index 26355a36f0..b8c4d692bf 100644 --- a/modules/distribution/product/src/main/assembly/filter.properties +++ b/modules/distribution/product/src/main/assembly/filter.properties @@ -3,7 +3,7 @@ product.key=AM product.version=4.3.0 product.wum.name=wso2am -carbon.version=4.8.1 +carbon.version=4.9.26.alpha1 am.version=4.3.0 default.server.role=APIManager bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator diff --git a/modules/distribution/product/src/main/conf/deployment.toml b/modules/distribution/product/src/main/conf/deployment.toml index f8f02848bb..e8719e6a1a 100755 --- a/modules/distribution/product/src/main/conf/deployment.toml +++ b/modules/distribution/product/src/main/conf/deployment.toml @@ -15,7 +15,7 @@ type = "database_unique_id" [database.apim_db] type = "h2" -url = "jdbc:h2:./repository/database/WSO2AM_DB;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE" +url = "jdbc:h2:./repository/database/WSO2AM_DB;DB_CLOSE_ON_EXIT=FALSE" username = "wso2carbon" password = "wso2carbon" diff --git a/modules/distribution/product/src/main/extensions/basicauth.jsp b/modules/distribution/product/src/main/extensions/basicauth.jsp index 66b3647813..3677d95b3d 100644 --- a/modules/distribution/product/src/main/extensions/basicauth.jsp +++ b/modules/distribution/product/src/main/extensions/basicauth.jsp @@ -277,6 +277,7 @@ name="password" value="" autocomplete="off" + required tabindex="2" placeholder="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "password")%>" data-testid="login-page-password-input" @@ -403,7 +404,7 @@ name="chkRemember" data-testid="login-page-remember-me-checkbox" > - <%=AuthenticationEndpointUtil.i18n(resourceBundle, "remember.me")%> + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "remember.me")%> ', '<%=Encode.forJavaScriptAttribute(Encode.forUriComponent(idpEntry.getValue()))%>')" id="icon-<%=iconId%>" title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <%=Encode.forHtmlAttribute(idpName)%>" > - + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <%=Encode.forHtmlContent(idpName)%> @@ -374,7 +385,7 @@ IWA"> <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> IWA @@ -408,7 +419,7 @@ title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%>"> - + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%> <%=AuthenticationEndpointUtil.i18n(resourceBundle, "fido.authenticator" )%> @@ -427,7 +438,7 @@ title="<%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with")%> <%=AuthenticationEndpointUtil.i18n(resourceBundle, "magic.link" )%>" data-componentid="login-page-sign-in-with-magic-link"> - + <%=AuthenticationEndpointUtil.i18n(resourceBundle, "sign.in.with" )%> <%=AuthenticationEndpointUtil.i18n(resourceBundle, "magic.link" )%> @@ -461,7 +472,7 @@ - + <%-- product-footer --%> <% File productFooterFile = new File(getServletContext().getRealPath("extensions/product-footer.jsp")); if (productFooterFile.exists()) { @@ -473,7 +484,7 @@ - + <%-- footer --%> <% File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp")); if (footerFile.exists()) { diff --git a/modules/distribution/product/src/main/extensions/password-recovery.jsp b/modules/distribution/product/src/main/extensions/password-recovery.jsp index ebbacd2041..704b8e6021 100644 --- a/modules/distribution/product/src/main/extensions/password-recovery.jsp +++ b/modules/distribution/product/src/main/extensions/password-recovery.jsp @@ -109,7 +109,7 @@ %> - + <% File headerFile = new File(getServletContext().getRealPath("extensions/header.jsp")); @@ -131,7 +131,7 @@ - + <%-- product-title --%> <% File productTitleFile = new File(getServletContext().getRealPath("extensions/product-title.jsp")); if (productTitleFile.exists()) { @@ -143,7 +143,7 @@ - + <%-- page content --%> <%=IdentityManagementEndpointUtil.i18n(recoveryResourceBundle, "Recover.password")%> @@ -275,7 +275,7 @@ - + <%-- product-footer --%> <% File productFooterFile = new File(getServletContext().getRealPath("extensions/product-footer.jsp")); if (productFooterFile.exists()) { @@ -287,7 +287,7 @@ - + <%-- footer --%> <% File footerFile = new File(getServletContext().getRealPath("extensions/footer.jsp")); if (footerFile.exists()) { diff --git a/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp b/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp index 31590a9b1a..cf5cedd06f 100644 --- a/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp +++ b/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp @@ -16,14 +16,14 @@ ~ under the License. --%> - +<%-- page content --> - + <%-- content --%> @@ -141,7 +141,7 @@ <%-- /Customizable content --%> - + <%-- /content --%> diff --git a/modules/distribution/product/src/main/extensions/product-footer.jsp b/modules/distribution/product/src/main/extensions/product-footer.jsp index 06ad2ef5d2..edfab5ee00 100644 --- a/modules/distribution/product/src/main/extensions/product-footer.jsp +++ b/modules/distribution/product/src/main/extensions/product-footer.jsp @@ -19,7 +19,7 @@ - +<%-- footer --%>