feat: Rename Analytics Artifacts and Cleanup Old Analytics configurat…

…ion - MEED-6999 - Meeds-io/meeds#2097
exoplatform · Jun 8, 2024 · ed8fbf1 · ed8fbf1
1 parent a9ac80c
commit ed8fbf1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 221 deletions.
diff --git a/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/configuration.xml b/ecm-wcm-extension/src/main/webapp/WEB-INF/conf/configuration.xml
@@ -71,7 +71,6 @@
   <import>war:/conf/social/activity-listeners-configuration.xml</import>
   <import>war:/conf/social/integration-configuration.xml</import>
   <import>war:/conf/social/css-class-configuration.xml</import>
-  <import profiles="analytics">war:/conf/social/analytics-ui-watchers-configuration.xml</import>
   <import>war:/conf/wcm-extension/dynamic-container-configuration.xml</import>
 
 </configuration>
diff --git a/...wcm-extension/src/main/webapp/WEB-INF/conf/social/analytics-ui-watchers-configuration.xml b/...wcm-extension/src/main/webapp/WEB-INF/conf/social/analytics-ui-watchers-configuration.xml
diff --git a/ecms-social-integration/pom.xml b/ecms-social-integration/pom.xml
@@ -84,7 +84,7 @@
       <artifactId>social-component-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.addons.analytics</groupId>
+      <groupId>io.meeds.analytics</groupId>
       <artifactId>analytics-api</artifactId>
       <scope>provided</scope>
     </dependency>

diff --git a/...ion/src/main/java/org/exoplatform/ecms/listener/analytics/AnalyticsDocumentsListener.java b/...ion/src/main/java/org/exoplatform/ecms/listener/analytics/AnalyticsDocumentsListener.java
@@ -1,7 +1,10 @@
 package org.exoplatform.ecms.listener.analytics;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import static io.meeds.analytics.utils.AnalyticsUtils.*;
+
+import javax.jcr.Node;
+
+import io.meeds.analytics.model.StatisticData;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.services.jcr.impl.core.NodeImpl;
 import org.exoplatform.services.listener.Asynchronous;
@@ -13,10 +16,6 @@
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
 
-import javax.jcr.Node;
-
-import static org.exoplatform.analytics.utils.AnalyticsUtils.addSpaceStatistics;
-
 @Asynchronous
 public class AnalyticsDocumentsListener extends Listener<String, Node> {
 
@@ -50,7 +49,7 @@ public void onEvent(Event<String, Node> event) throws Exception {
     statisticData.addParameter("documentsOwner", ((NodeImpl) data).getACL().getOwner());
     String nodePath = data.getPath();
     addSpaceStatistic(statisticData, nodePath);
-    AnalyticsUtils.addStatisticData(statisticData);
+    addStatisticData(statisticData);
   }
 
   public IdentityManager getIdentityManager() {

diff --git a/...al-integration/src/main/java/org/exoplatform/ecms/listener/analytics/JCRNodeListener.java b/...al-integration/src/main/java/org/exoplatform/ecms/listener/analytics/JCRNodeListener.java
@@ -1,6 +1,6 @@
 package org.exoplatform.ecms.listener.analytics;
 
-import static org.exoplatform.analytics.utils.AnalyticsUtils.addSpaceStatistics;
+import static io.meeds.analytics.utils.AnalyticsUtils.addSpaceStatistics;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -15,8 +15,8 @@
 import org.apache.commons.chain.Context;
 import org.apache.commons.lang3.StringUtils;
 
-import org.exoplatform.analytics.model.StatisticData;
-import org.exoplatform.analytics.utils.AnalyticsUtils;
+import io.meeds.analytics.model.StatisticData;
+import io.meeds.analytics.utils.AnalyticsUtils;
 import org.exoplatform.commons.utils.PropertyManager;
 import org.exoplatform.container.ExoContainerContext;
 import org.exoplatform.container.PortalContainer;