0005789: Moved monitors and notifications to pro

symmetric-android/src/main/java/org/jumpmind/symmetric/android/AndroidSymmetricEngine.java

@@ -48,7 +48,6 @@
 import org.jumpmind.symmetric.service.IConfigurationService;
 import org.jumpmind.symmetric.service.IExtensionService;
 import org.jumpmind.symmetric.service.IFileSyncService;
-import org.jumpmind.symmetric.service.IMonitorService;
 import org.jumpmind.symmetric.service.INodeCommunicationService;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IParameterService;
@@ -140,11 +139,6 @@ protected IFileSyncService buildFileSyncService() {
         return new AndroidFileSyncService(this);
     }
 
-    @Override
-    protected IMonitorService buildMonitorService(ISymmetricDialect symmetricDialect) {
-        return new AndroidMonitorService(this);
-    }
-
     @Override
     protected IClusterService createClusterService() {
         return new AndroidClusterService(parameterService, symmetricDialect, nodeService);

symmetric-assemble/src/asciidoc/configuration.ad

@@ -50,8 +50,7 @@ ifdef::pro[]
 include::configuration/users.ad[]
 include::configuration/ldap.ad[]
 include::configuration/license-key.ad[]
-endif::pro[]
-
 include::configuration/mail-server.ad[]
 include::configuration/monitors.ad[]
 include::configuration/notifications.ad[]
+endif::pro[]

symmetric-assemble/src/asciidoc/manage.ad

@@ -264,11 +264,7 @@ include::manage/push-threads.ad[]
 ifdef::pro[]
 include::manage/jvm-properties.ad[]
 include::manage/jvm-threads.ad[]
-endif::pro[]
-
 include::manage/monitors.ad[]
-
-ifdef::pro[]
 include::manage/security.ad[]
 include::manage/rest-keys.ad[]
 endif::pro[]

symmetric-client/src/main/java/org/jumpmind/symmetric/ClientSymmetricEngine.java

@@ -61,6 +61,7 @@
 import org.jumpmind.symmetric.common.SystemConstants;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
 import org.jumpmind.symmetric.db.JdbcSymmetricDialectFactory;
+import org.jumpmind.symmetric.ext.ICached;
 import org.jumpmind.symmetric.io.stage.BatchStagingManager;
 import org.jumpmind.symmetric.io.stage.IStagingManager;
 import org.jumpmind.symmetric.job.IJobManager;
@@ -508,7 +509,8 @@ public File snapshot(IProgressListener listener) {
     @Override
     public void clearCaches() {
         super.clearCaches();
-        monitorService.flushMonitorCache();
-        monitorService.flushNotificationCache();
+        for (ICached cachedExtension : extensionService.getExtensionPointList(ICached.class)) {
+            cachedExtension.flushCache();
+        }
     }
 }

symmetric-client/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java

@@ -49,7 +49,7 @@
 @ManagedResource(description = "The management interface for a job")
 abstract public class AbstractJob implements Runnable, IJob {
     protected final Logger log = LoggerFactory.getLogger(getClass());
-    private String jobName;
+    protected String jobName;
     private JobDefinition jobDefinition;
     private AtomicBoolean paused = new AtomicBoolean(false);
     private Date lastFinishTime;
@@ -62,10 +62,10 @@ abstract public class AbstractJob implements Runnable, IJob {
     protected ISymmetricEngine engine;
     private ThreadPoolTaskScheduler taskScheduler;
     private ScheduledFuture<?> scheduledJob;
-    private RandomTimeSlot randomTimeSlot;
+    protected RandomTimeSlot randomTimeSlot;
     private CronTrigger cronTrigger;
     private Date periodicFirstRunTime;
-    private IParameterService parameterService;
+    protected IParameterService parameterService;
     private long processedCount;
     private String targetNodeId;
     private int targetNodeCount;
@@ -455,4 +455,8 @@ public IParameterService getParameterService() {
     public void setParameterService(IParameterService parameterService) {
         this.parameterService = parameterService;
     }
+
+    public void setThreadPoolTaskScheduler(ThreadPoolTaskScheduler taskScheduler) {
+        this.taskScheduler = taskScheduler;
+    }
 }

symmetric-client/src/main/java/org/jumpmind/symmetric/job/BuiltInJobs.java

@@ -56,10 +56,16 @@ public List<IJob> getBuiltInJobs(ISymmetricEngine engine, ThreadPoolTaskSchedule
         builtInJobs.add(new FileSyncPullJob(engine, taskScheduler));
         builtInJobs.add(new FileSyncPushJob(engine, taskScheduler));
         builtInJobs.add(new InitialLoadExtractorJob(engine, taskScheduler));
-        builtInJobs.add(new MonitorJob(engine, taskScheduler));
         builtInJobs.add(new ReportStatusJob(engine, taskScheduler));
         builtInJobs.add(new LogMinerJob(engine, taskScheduler));
         builtInJobs.add(new InitialLoadJob(engine, taskScheduler));
+        List<IJob> extendedJobs = engine.getExtensionService().getExtensionPointList(IJob.class);
+        for (IJob extendedJob : extendedJobs) {
+            if (extendedJob instanceof AbstractJob) {
+                ((AbstractJob) extendedJob).setTaskScheduler(taskScheduler);
+            }
+            builtInJobs.add(extendedJob);
+        }
         for (IJob builtInJob : builtInJobs) {
             setBuiltInDefaults(builtInJob);
         }

symmetric-client/src/main/java/org/jumpmind/symmetric/util/SnapshotUtil.java

@@ -98,7 +98,6 @@
 import org.jumpmind.symmetric.model.Trigger;
 import org.jumpmind.symmetric.model.TriggerHistory;
 import org.jumpmind.symmetric.model.TriggerRouter;
-import org.jumpmind.symmetric.monitor.MonitorTypeBlock;
 import org.jumpmind.symmetric.service.IClusterService;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IParameterService;
@@ -806,7 +805,7 @@ private static File createTransactionsFile(ISymmetricEngine engine, String paren
         List<Transaction> filteredTransactions = new ArrayList<Transaction>();
         String dbUser = engine.getParameterService().getString("db.user");
         for (Transaction transaction : transactions) {
-            MonitorTypeBlock.filterTransactions(transaction, transactionMap, filteredTransactions, dbUser, false, false);
+            SymmetricUtils.filterTransactions(transaction, transactionMap, filteredTransactions, dbUser, false, false);
         }
         File file = new File(parent, "transactions.csv");
         try (OutputStream outputStream = new FileOutputStream(file);

symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java

@@ -84,8 +84,6 @@
 import org.jumpmind.symmetric.service.IIncomingBatchService;
 import org.jumpmind.symmetric.service.IInitialLoadService;
 import org.jumpmind.symmetric.service.ILoadFilterService;
-import org.jumpmind.symmetric.service.IMailService;
-import org.jumpmind.symmetric.service.IMonitorService;
 import org.jumpmind.symmetric.service.INodeCommunicationService;
 import org.jumpmind.symmetric.service.INodeService;
 import org.jumpmind.symmetric.service.IOfflinePullService;
@@ -116,8 +114,6 @@
 import org.jumpmind.symmetric.service.impl.IncomingBatchService;
 import org.jumpmind.symmetric.service.impl.InitialLoadService;
 import org.jumpmind.symmetric.service.impl.LoadFilterService;
-import org.jumpmind.symmetric.service.impl.MailService;
-import org.jumpmind.symmetric.service.impl.MonitorService;
 import org.jumpmind.symmetric.service.impl.NodeCommunicationService;
 import org.jumpmind.symmetric.service.impl.NodeService;
 import org.jumpmind.symmetric.service.impl.OfflinePullService;
@@ -196,10 +192,8 @@ abstract public class AbstractSymmetricEngine implements ISymmetricEngine {
     protected IStagingManager stagingManager;
     protected INodeCommunicationService nodeCommunicationService;
     protected IFileSyncService fileSyncService;
-    protected IMailService mailService;
     protected IContextService contextService;
     protected IUpdateService updateService;
-    protected IMonitorService monitorService;
     protected ICacheManager cacheManager;
     protected Date lastRestartTime = null;
 
@@ -336,8 +330,6 @@ protected void init() {
                 configurationService, extensionService, offlineTransportManager);
         this.fileSyncService = buildFileSyncService();
         this.fileSyncExtractorService = new FileSyncExtractorService(this);
-        this.mailService = new MailService(parameterService, securityService, symmetricDialect);
-        this.monitorService = buildMonitorService(symmetricDialect);
         String updateServiceClassName = properties.get(ParameterConstants.UPDATE_SERVICE_CLASS);
         if (updateServiceClassName == null) {
             this.updateService = new UpdateService(this);
@@ -391,10 +383,6 @@ protected INodeCommunicationService buildNodeCommunicationService(IClusterServic
         return new NodeCommunicationService(clusterService, nodeService, parameterService, configurationService, symmetricDialect);
     }
 
-    protected IMonitorService buildMonitorService(ISymmetricDialect symmetricDialect) {
-        return new MonitorService(this, symmetricDialect);
-    }
-
     abstract protected IStagingManager createStagingManager();
 
     abstract protected IStatisticManager createStatisticManager();
@@ -1135,10 +1123,6 @@ public IExtensionService getExtensionService() {
         return extensionService;
     }
 
-    public IMailService getMailService() {
-        return mailService;
-    }
-
     public IContextService getContextService() {
         return contextService;
     }
@@ -1236,10 +1220,6 @@ public IUpdateService getUpdateService() {
         return updateService;
     }
 
-    public IMonitorService getMonitorService() {
-        return monitorService;
-    }
-
     @Override
     public String getNodeId() {
         return getNodeService().findIdentityNodeId();