diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderImpl.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderImpl.java index a7eb29c74a01..56186016db9c 100644 --- a/dotCMS/src/main/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderImpl.java +++ b/dotCMS/src/main/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderImpl.java @@ -32,7 +32,7 @@ public class RemoteAnnouncementsLoaderImpl implements AnnouncementsLoader{ //This is the url to the dotCMS instance set to provide and feed all consumers with announcements static final Lazy BASE_URL_LAZY_SUPPLIER = - Lazy.of(() -> Config.getStringProperty("ANNOUNCEMENTS_BASE_URL", "https://www.dotcms.com")); + Lazy.of(() -> Config.getStringProperty("ANNOUNCEMENTS_BASE_URL", "https://www2.dotcms.com")); static final String ANNOUNCEMENTS_QUERY = "/api/content/render/false/query/+contentType:Announcement%20+languageId:1%20+deleted:false%20+live:true%20/orderby/Announcement.announcementDate%20desc"; @@ -70,7 +70,7 @@ public List loadAnnouncements() { JsonNode loadRemoteAnnouncements() { final String url = buildURL(); //Let's log the url to retrieve the announcements for debugging purposes on postman - Logger.debug(AnnouncementsHelperImpl.class, String.format("loading announcements from [%s]", url)); + Logger.info(AnnouncementsHelperImpl.class, String.format("loading announcements from [%s]", url)); try { final Client client = restClient(); final WebTarget webTarget = client.target(url); @@ -160,4 +160,4 @@ List toAnnouncements(final JsonNode root) { } -} \ No newline at end of file +} diff --git a/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java b/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java index 24cd6359df07..88e60551278e 100644 --- a/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java +++ b/dotcms-integration/src/test/java/com/dotcms/filters/VanityUrlFilterTest.java @@ -176,7 +176,7 @@ public void test_that_vanity_url_filter_handles_proxy_requests() throws Exceptio String content = FileUtil.read(tmp); assert (content != null); assert (content.contains("All rights reserved")); - assert (content.contains("")); + assert (content.contains("content=\"dotCMS\"")); } } diff --git a/dotcms-integration/src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java b/dotcms-integration/src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java index 6fcbacc07602..eeaae241def1 100644 --- a/dotcms-integration/src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java +++ b/dotcms-integration/src/test/java/com/dotcms/http/CircuitBreakerUrlTest.java @@ -376,7 +376,7 @@ public void testGet() { for (int i = 0; i < 10; i++) { try { String x = new CircuitBreakerUrl(goodUrl, 2000).doString(); - assert (x.contains("/application/themes/dotcms/js/bootstrap.min.js")); + assert (x.contains("content=\"dotCMS\"")); } catch (Exception e) { assert (e instanceof CircuitBreakerOpenException); diff --git a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java index 0e486250fd12..a1a71e0c4ae4 100644 --- a/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java +++ b/dotcms-integration/src/test/java/com/dotcms/rest/api/v1/announcements/RemoteAnnouncementsLoaderIntegrationTest.java @@ -22,7 +22,7 @@ */ public class RemoteAnnouncementsLoaderIntegrationTest { - public static final String DOTCMS_COM = "https://www.dotcms.com"; + public static final String DOTCMS_COM = "https://www2.dotcms.com"; @BeforeClass public static void prepare() throws Exception {