From f3bcd988ec1f959210d999f5a53e9b3cac3b8f60 Mon Sep 17 00:00:00 2001 From: Yassine EL OUARDI Date: Thu, 16 Nov 2023 14:07:42 +0100 Subject: [PATCH] Migrate legacy URLs into the new vanity URL tool - writing the script - Ignore countries generation from eaton.com - Ignore 404 internal resource --- bundle-cloud/pom.xml | 124 ++++++++++++++++++ .../CloudDispatcherFlushRulesExecutor.java | 0 .../impl/CloudDispatcherFlusher.java | 0 .../dispatcher/DispatcherFlushRules.java | 30 +++++ .../redirectmappage/clientlibs/app.js | 2 +- 5 files changed, 155 insertions(+), 1 deletion(-) create mode 100644 bundle-cloud/pom.xml create mode 100644 bundle-cloud/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/CloudDispatcherFlushRulesExecutor.java create mode 100644 bundle-cloud/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/CloudDispatcherFlusher.java create mode 100644 bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/DispatcherFlushRules.java diff --git a/bundle-cloud/pom.xml b/bundle-cloud/pom.xml new file mode 100644 index 0000000000..d305e82feb --- /dev/null +++ b/bundle-cloud/pom.xml @@ -0,0 +1,124 @@ + + + + 4.0.0 + + + + + + com.adobe.acs + acs-aem-commons + 6.0.11 + + + + + + acs-aem-commons-bundle-cloud + ACS AEM Commons Bundle - Core Cloud Fragment + OSGi Core bundle fragment for ACS AEM Commons (only AEMaaCS) + + + + biz.aQute.bnd + bnd-maven-plugin + + + + + + biz.aQute.bnd + bnd-baseline-maven-plugin + + + org.apache.sling + sling-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-jar-plugin + + + + + + + + com.google.code.findbugs + jsr305 + provided + + + com.adobe.acs + acs-aem-commons-bundle + ${project.version} + provided + + + + com.adobe.acs + acs-aem-commons-bundle + ${project.version} + tests + test-jar + test + + + junit + junit + test + + + org.mockito + mockito-core + test + + + org.apache.sling + org.apache.sling.testing.osgi-mock.junit4 + test + + + org.apache.sling + org.apache.sling.testing.sling-mock.junit4 + test + + + io.wcm + io.wcm.testing.aem-mock.junit4 + test + + + + + com.adobe.aem + aem-sdk-api + provided + + + diff --git a/bundle-cloud/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/CloudDispatcherFlushRulesExecutor.java b/bundle-cloud/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/CloudDispatcherFlushRulesExecutor.java new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bundle-cloud/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/CloudDispatcherFlusher.java b/bundle-cloud/src/main/java/com/adobe/acs/commons/replication/dispatcher/impl/CloudDispatcherFlusher.java new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/DispatcherFlushRules.java b/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/DispatcherFlushRules.java new file mode 100644 index 0000000000..b73bc975f5 --- /dev/null +++ b/bundle/src/main/java/com/adobe/acs/commons/replication/dispatcher/DispatcherFlushRules.java @@ -0,0 +1,30 @@ +/* + * #%L + * ACS AEM Commons Bundle + * %% + * Copyright (C) 2016 Adobe + * %% + * Licensed 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. + * #L% + */ +package com.adobe.acs.commons.replication.dispatcher; + +import com.day.cq.replication.ReplicationAction; +import com.day.cq.replication.ReplicationException; +import com.day.cq.replication.ReplicationOptions; + +public interface DispatcherFlushRules { + + void preprocess(final ReplicationAction replicationAction, + final ReplicationOptions replicationOptions) throws ReplicationException; +} \ No newline at end of file diff --git a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/redirectmappage/clientlibs/app.js b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/redirectmappage/clientlibs/app.js index 2dc27ceda4..d98e3fb373 100644 --- a/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/redirectmappage/clientlibs/app.js +++ b/ui.apps/src/main/content/jcr_root/apps/acs-commons/components/utilities/redirectmappage/clientlibs/app.js @@ -82,7 +82,7 @@ $scope.loadMoreData = function () { if ($scope.hasMoreData && $scope.itemsPerPage < $scope.entries.length) { - $scope.itemsPerPage = $scope.itemsPerPage * 2; + $scope.itemsPerPage = $scope.itemsPerPage +100; $scope.filterEntries(); } };