From 067600475c5a4943c7f3927e499e03d39f99dbc3 Mon Sep 17 00:00:00 2001 From: tharikaGitHub Date: Fri, 20 Sep 2019 18:09:17 +0530 Subject: [PATCH 1/2] Add assembly for packing customized files for login and signup --- modules/distribution/pom.xml | 35 ++++ .../product/src/main/assembly/bin.xml | 32 +++- .../main/extensions/cookie-policy-content.jsp | 176 ++++++++++++++++++ .../product/src/main/extensions/footer.jsp | 34 ++++ .../product/src/main/extensions/header.jsp | 35 ++++ .../extensions/privacy-policy-content.jsp | 147 +++++++++++++++ .../product/src/main/extensions/title.jsp | 22 +++ 7 files changed, 479 insertions(+), 2 deletions(-) create mode 100644 modules/distribution/product/src/main/extensions/cookie-policy-content.jsp create mode 100644 modules/distribution/product/src/main/extensions/footer.jsp create mode 100644 modules/distribution/product/src/main/extensions/header.jsp create mode 100644 modules/distribution/product/src/main/extensions/privacy-policy-content.jsp create mode 100644 modules/distribution/product/src/main/extensions/title.jsp diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 2068ba6760..99405509e1 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -44,4 +44,39 @@ product + + + + org.apache.maven.plugins + maven-antrun-plugin + + + extract-docs-from-components + package + + run + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/distribution/product/src/main/assembly/bin.xml b/modules/distribution/product/src/main/assembly/bin.xml index a6281ef27f..6e904b0ec1 100644 --- a/modules/distribution/product/src/main/assembly/bin.xml +++ b/modules/distribution/product/src/main/assembly/bin.xml @@ -555,7 +555,22 @@ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - authenticationendpoint.war + authenticationendpoint/ + + + + + + src/main/extensions + + ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/authenticationendpoint/extensions + + + title.jsp + header.jsp + footer.jsp + cookie-policy-content.jsp + privacy-policy-content.jsp @@ -566,7 +581,20 @@ ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps - accountrecoveryendpoint.war + accountrecoveryendpoint/ + + + + + + src/main/extensions + + ${pom.artifactId}-${pom.version}/repository/deployment/server/webapps/accountrecoveryendpoint/extensions + + + title.jsp + header.jsp + footer.jsp diff --git a/modules/distribution/product/src/main/extensions/cookie-policy-content.jsp b/modules/distribution/product/src/main/extensions/cookie-policy-content.jsp new file mode 100644 index 0000000000..5b00dca0a9 --- /dev/null +++ b/modules/distribution/product/src/main/extensions/cookie-policy-content.jsp @@ -0,0 +1,176 @@ +<%-- + ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ + ~ WSO2 Inc. 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. + --%> + + +
+
+
+
+
+ + + +
+
+ diff --git a/modules/distribution/product/src/main/extensions/footer.jsp b/modules/distribution/product/src/main/extensions/footer.jsp new file mode 100644 index 0000000000..a59e64546d --- /dev/null +++ b/modules/distribution/product/src/main/extensions/footer.jsp @@ -0,0 +1,34 @@ +<%-- + ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ + ~ WSO2 Inc. 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. + --%> + + + + + diff --git a/modules/distribution/product/src/main/extensions/header.jsp b/modules/distribution/product/src/main/extensions/header.jsp new file mode 100644 index 0000000000..b3aa6f96a3 --- /dev/null +++ b/modules/distribution/product/src/main/extensions/header.jsp @@ -0,0 +1,35 @@ +<%-- + ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ + ~ WSO2 Inc. 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. + --%> + + + + +
+

+
+
+ + +

API Manager

+ +
+
+
diff --git a/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp b/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp new file mode 100644 index 0000000000..bcc4a89bd9 --- /dev/null +++ b/modules/distribution/product/src/main/extensions/privacy-policy-content.jsp @@ -0,0 +1,147 @@ +<%-- + ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ + ~ WSO2 Inc. 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. + --%> + + +
+
+
+
+
+ + + +
+
+ diff --git a/modules/distribution/product/src/main/extensions/title.jsp b/modules/distribution/product/src/main/extensions/title.jsp new file mode 100644 index 0000000000..32bb4fc57a --- /dev/null +++ b/modules/distribution/product/src/main/extensions/title.jsp @@ -0,0 +1,22 @@ +<%-- + ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. + ~ + ~ WSO2 Inc. 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. + --%> + + + + +WSO2 API Manager From c91b89bd80ea9aa925d5d823b99d80da3a2bf7c7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2019 12:42:07 +0000 Subject: [PATCH 2/2] Bump carbon.identity-inbound-auth-oauth.version from 6.2.17 to 6.2.20 Bumps `carbon.identity-inbound-auth-oauth.version` from 6.2.17 to 6.2.20. Updates `org.wso2.carbon.identity.oauth.stub` from 6.2.17 to 6.2.20 Updates `org.wso2.carbon.identity.oauth` from 6.2.17 to 6.2.20 Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a7e101632..85148bbe12 100644 --- a/pom.xml +++ b/pom.xml @@ -1177,7 +1177,7 @@ 5.14.62 1.3.8 1.3.0 - 6.2.17 + 6.2.20 1.2.3 5.3.3 5.4.2