PP Filters basic, working

dotCMS · Oct 17, 2024 · 2cd6c59 · 2cd6c59
1 parent 0e705f2
commit 2cd6c59
Show file tree

Hide file tree

Showing 13 changed files with 680 additions and 468 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/config/DotInitializationService.java b/dotCMS/src/main/java/com/dotcms/config/DotInitializationService.java
@@ -2,6 +2,7 @@
 
 import com.dotcms.api.system.event.PayloadVerifierFactoryInitializer;
 import com.dotcms.api.system.event.SystemEventProcessorFactoryInitializer;
+import com.dotcms.publishing.PushPublishFiltersInitializer;
 import com.dotcms.rendering.velocity.events.ExceptionHandlersInitializer;
 import com.dotcms.system.event.local.business.LocalSystemEventSubscribersInitializer;
 import com.dotcms.util.ReflectionUtils;
@@ -108,7 +109,7 @@ private Set<DotInitializer> getInternalInitializers() {
                 new SystemEventProcessorFactoryInitializer(),
                 new PayloadVerifierFactoryInitializer(),
                 new LocalSystemEventSubscribersInitializer(),
-                new ExceptionHandlersInitializer()),
+                new ExceptionHandlersInitializer(),
                 new PushPublishFiltersInitializer());
     } // getInternalInitializers.
 

diff --git a/dotCMS/src/main/java/com/dotcms/publisher/ajax/RemotePublishAjaxAction.java b/dotCMS/src/main/java/com/dotcms/publisher/ajax/RemotePublishAjaxAction.java
@@ -24,6 +24,7 @@
 import com.dotcms.publishing.Publisher;
 import com.dotcms.publishing.PublisherConfig;
 import com.dotcms.publishing.PublisherConfig.DeliveryStrategy;
+import com.dotmarketing.util.*;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.FileUploadException;
@@ -43,12 +44,6 @@
 import com.dotmarketing.portlets.folders.model.Folder;
 import com.dotmarketing.portlets.workflows.model.WorkflowActionFailureException;
 import com.dotmarketing.servlets.ajax.AjaxAction;
-import com.dotmarketing.util.ConfigUtils;
-import com.dotmarketing.util.FileUtil;
-import com.dotmarketing.util.InodeUtils;
-import com.dotmarketing.util.Logger;
-import com.dotmarketing.util.UtilMethods;
-import com.dotmarketing.util.WebKeys;
 import com.dotmarketing.util.json.JSONArray;
 import com.dotmarketing.util.json.JSONException;
 import com.dotmarketing.util.json.JSONObject;

diff --git a/dotCMS/src/main/java/com/dotcms/publisher/bundle/bean/Bundle.java b/dotCMS/src/main/java/com/dotcms/publisher/bundle/bean/Bundle.java
@@ -1,5 +1,7 @@
 package com.dotcms.publisher.bundle.bean;
 
+import com.dotmarketing.util.Config;
+
 import java.util.Date;
 
 public class Bundle {

diff --git a/dotCMS/src/main/java/com/dotcms/publisher/bundle/business/BundleFactoryImpl.java b/dotCMS/src/main/java/com/dotcms/publisher/bundle/business/BundleFactoryImpl.java
@@ -28,6 +28,7 @@ public void saveBundle(Bundle bundle) throws DotDataException {
 		dc.addParam(bundle.getExpireDate());
 		dc.addParam(bundle.getOwner());
 		dc.addParam(bundle.isForcePush());
+		dc.addParam(bundle.getFilterKey());
 		dc.loadResult();
 	}
 
@@ -163,6 +164,7 @@ public void updateBundle(Bundle bundle) throws DotDataException {
 		dc.addParam(bundle.getPublishDate());
 		dc.addParam(bundle.getExpireDate());
 		dc.addParam(bundle.isForcePush());
+		dc.addParam(bundle.getFilterKey());
 		dc.addParam(bundle.getId());
 
 		dc.loadResult();