SettingsManager / Split harvester settings and system settings.

geonetwork · Jul 5, 2013 · 7df46d0 · 7df46d0
1 parent 2ef9aeb
commit 7df46d0
Show file tree

Hide file tree

Showing 21 changed files with 766 additions and 18 deletions.
diff --git a/core/src/main/java/org/fao/geonet/kernel/setting/HarvesterSettingsManager.java b/core/src/main/java/org/fao/geonet/kernel/setting/HarvesterSettingsManager.java
diff --git a/core/src/main/java/org/fao/geonet/kernel/setting/SettingManager.java b/core/src/main/java/org/fao/geonet/kernel/setting/SettingManager.java
@@ -230,7 +230,7 @@ public boolean setValues(Dbms dbms, Map<String, Object> values) throws SQLExcept
 			{
 				String path = entry.getKey();
 				String value= makeString(entry.getValue());
-                if(Log.isDebugEnabled(Geonet.SPATIAL))
+                if(Log.isDebugEnabled(Geonet.SETTINGS))
                     Log.debug(Geonet.SETTINGS, "Set path: " + path + ", value: " + value);
 
 				Setting s = resolve(path);

diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/HarvestManager.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/HarvestManager.java
@@ -23,6 +23,13 @@
 
 package org.fao.geonet.kernel.harvest;
 
+import static org.quartz.impl.matchers.GroupMatcher.jobGroupEquals;
+
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 import jeeves.exceptions.BadInputEx;
 import jeeves.exceptions.JeevesException;
 import jeeves.exceptions.MissingParameterEx;
@@ -31,6 +38,7 @@
 import jeeves.server.resources.ResourceManager;
 import jeeves.utils.Log;
 import jeeves.utils.Xml;
+
 import org.fao.geonet.GeonetContext;
 import org.fao.geonet.constants.Edit;
 import org.fao.geonet.constants.Geonet;
@@ -41,17 +49,11 @@
 import org.fao.geonet.kernel.harvest.harvester.AbstractHarvester;
 import org.fao.geonet.kernel.harvest.harvester.HarversterJobListener;
 import org.fao.geonet.kernel.harvest.harvester.HarvesterHistoryDao;
+import org.fao.geonet.kernel.setting.HarvesterSettingsManager;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.jdom.Element;
 import org.quartz.SchedulerException;
 
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import static org.quartz.impl.matchers.GroupMatcher.jobGroupEquals;
-
 /**
  * TODO Javadoc.
  *
@@ -73,7 +75,7 @@ public class HarvestManager implements HarvestInfoProvider
      * @param dm datamanager
      * @throws Exception hmm
      */
-	public HarvestManager(ServiceContext context, GeonetContext gc, SettingManager sm, DataManager dm) throws Exception {
+	public HarvestManager(ServiceContext context, GeonetContext gc, HarvesterSettingsManager sm, DataManager dm) throws Exception {
 		this.context = context;
         this.readOnly = gc.isReadOnly();
         Log.debug(Geonet.HARVEST_MAN, "HarvesterManager initializing, READONLYMODE is " + this.readOnly);
@@ -548,7 +550,7 @@ public void setReadOnly(boolean readOnly) {
 	//---------------------------------------------------------------------------
 
 	private String         xslPath;
-	private SettingManager settingMan;
+	private HarvesterSettingsManager settingMan;
 	private DataManager    dataMan;
 	private ServiceContext context;
     private boolean readOnly;

diff --git a/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java b/harvesters/src/main/java/org/fao/geonet/kernel/harvest/harvester/AbstractHarvester.java
@@ -55,7 +55,7 @@
 import org.fao.geonet.kernel.harvest.harvester.wfsfeatures.WfsFeaturesHarvester;
 import org.fao.geonet.kernel.harvest.harvester.z3950.Z3950Harvester;
 import org.fao.geonet.kernel.harvest.harvester.z3950Config.Z3950ConfigHarvester;
-import org.fao.geonet.kernel.setting.SettingManager;
+import org.fao.geonet.kernel.setting.HarvesterSettingsManager;
 import org.fao.geonet.lib.Lib;
 import org.fao.geonet.monitor.harvest.AbstractHarvesterErrorCounter;
 import org.fao.geonet.resources.Resources;
@@ -143,7 +143,7 @@ private static void register(ServiceContext context, Class<?> harvester) throws
      * @throws BadParameterEx
      * @throws OperationAbortedEx
      */
-	public static AbstractHarvester create(String type, ServiceContext context, SettingManager sm, DataManager dm) throws BadParameterEx, OperationAbortedEx {
+	public static AbstractHarvester create(String type, ServiceContext context, HarvesterSettingsManager sm, DataManager dm) throws BadParameterEx, OperationAbortedEx {
 		//--- raises an exception if type is null
 		if (type == null) {
 			throw new BadParameterEx("type", null);
@@ -864,7 +864,7 @@ protected Element getResult() {
     private boolean running = false;
 
 	protected ServiceContext context;
-	protected SettingManager settingMan;
+	protected HarvesterSettingsManager settingMan;
 	protected DataManager    dataMan;
 
     protected AbstractParams params;

diff --git a/web/src/main/java/org/fao/geonet/Geonetwork.java b/web/src/main/java/org/fao/geonet/Geonetwork.java
@@ -71,11 +71,13 @@
 import org.fao.geonet.kernel.csw.CatalogConfiguration;
 import org.fao.geonet.kernel.csw.CswHarvesterResponseExecutionService;
 import org.fao.geonet.kernel.harvest.HarvestManager;
+import org.fao.geonet.kernel.metadata.StatusActions;
 import org.fao.geonet.kernel.oaipmh.OaiPmhDispatcher;
 import org.fao.geonet.kernel.search.LuceneConfig;
 import org.fao.geonet.kernel.search.SearchManager;
 import org.fao.geonet.kernel.search.spatial.Pair;
 import org.fao.geonet.kernel.search.spatial.SpatialIndexWriter;
+import org.fao.geonet.kernel.setting.HarvesterSettingsManager;
 import org.fao.geonet.kernel.setting.SettingInfo;
 import org.fao.geonet.kernel.setting.SettingManager;
 import org.fao.geonet.languages.IsoLanguagesMapper;
@@ -86,7 +88,6 @@
 import org.fao.geonet.notifier.MetadataNotifierControl;
 import org.fao.geonet.notifier.MetadataNotifierManager;
 import org.fao.geonet.resources.Resources;
-import org.fao.geonet.kernel.metadata.StatusActions;
 import org.fao.geonet.services.util.z3950.Repositories;
 import org.fao.geonet.services.util.z3950.Server;
 import org.fao.geonet.util.ThreadPool;
@@ -420,8 +421,8 @@ public Object start(Element config, ServiceContext context) throws Exception {
         gnContext.threadPool  = threadPool;
         gnContext.statusActionsClass = statusActionsClass;
 
-
-        HarvestManager harvestMan = new HarvestManager(context, gnContext, settingMan, dataMan);
+        HarvesterSettingsManager harvesterSettingsMan = new HarvesterSettingsManager(dbms, context.getProviderManager());
+        HarvestManager harvestMan = new HarvestManager(context, gnContext, harvesterSettingsMan, dataMan);
 
         //------------------------------------------------------------------------
         //--- return application context
@@ -432,6 +433,7 @@ public Object start(Element config, ServiceContext context) throws Exception {
 		beanFactory.registerSingleton("schemaManager", schemaMan);
 		beanFactory.registerSingleton("serviceHandlerConfig", handlerConfig);
 		beanFactory.registerSingleton("settingManager", settingMan);
+		beanFactory.registerSingleton("harvesterSettingsMan", harvesterSettingsMan);
 		beanFactory.registerSingleton("thesaurusManager", thesaurusMan);
 		beanFactory.registerSingleton("oaipmhDisatcher", oaipmhDis);
 		beanFactory.registerSingleton("metadataNotifierManager", metadataNotifierMan);

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-db2.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-db2.sql
@@ -38,6 +38,15 @@ CREATE TABLE Settings
     value     CLOB(1G),
     primary key(id)
   );
+
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     CLOB(1G),
+    primary key(id)
+  );
 
 -- ======================================================================
 
@@ -464,6 +473,7 @@ ALTER TABLE OperationsDes ADD FOREIGN KEY (idDes) REFERENCES Operations (id);
 ALTER TABLE RegionsDes ADD FOREIGN KEY (langId) REFERENCES Languages (id);
 ALTER TABLE RegionsDes ADD FOREIGN KEY (idDes) REFERENCES Regions (id);
 ALTER TABLE Settings ADD FOREIGN KEY (parentId) REFERENCES Settings (id);
+ALTER TABLE HarvesterSettings ADD FOREIGN KEY (parentId) REFERENCES HarvesterSettings (id);
 ALTER TABLE UserGroups ADD FOREIGN KEY (userId) REFERENCES Users (id);
 ALTER TABLE UserGroups ADD FOREIGN KEY (groupId) REFERENCES Groups (id);
 ALTER TABLE MetadataNotifications ADD FOREIGN KEY (notifierId) REFERENCES MetadataNotifiers(id);

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-default.sql
@@ -44,6 +44,18 @@ CREATE TABLE Settings
     foreign key(parentId) references Settings(id)
   );
 
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     longvarchar,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
+
 -- ======================================================================
 
 CREATE TABLE Languages

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-mysql.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-mysql.sql
@@ -43,7 +43,18 @@ CREATE TABLE Settings
 
     foreign key(parentId) references Settings(id)
   );
+
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     longtext,
+
+    primary key(id),
 
+    foreign key(parentId) references HarvesterSettings(id)
+  );
 -- ======================================================================
 
 CREATE TABLE Languages

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-oracle.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-oracle.sql
@@ -38,7 +38,16 @@ CREATE TABLE Settings
     value     clob,
     primary key(id)
   );
-
+
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar2(64)   not null,
+    value     clob,
+    primary key(id)
+  );
+
 REM ======================================================================
 
 CREATE TABLE Languages
@@ -487,6 +496,7 @@ ALTER TABLE OperationsDes ADD FOREIGN KEY (idDes) REFERENCES Operations (id);
 ALTER TABLE RegionsDes ADD FOREIGN KEY (langId) REFERENCES Languages (id);
 ALTER TABLE RegionsDes ADD FOREIGN KEY (idDes) REFERENCES Regions (id);
 ALTER TABLE Settings ADD FOREIGN KEY (parentId) REFERENCES Settings (id);
+ALTER TABLE HarvesterSettings ADD FOREIGN KEY (parentId) REFERENCES HarvesterSettings (id);
 ALTER TABLE UserGroups ADD FOREIGN KEY (userId) REFERENCES Users (id);
 ALTER TABLE UserGroups ADD FOREIGN KEY (groupId) REFERENCES Groups (id);
 ALTER TABLE MetadataNotifications ADD FOREIGN KEY (notifierId) REFERENCES MetadataNotifiers(id);

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-postgis.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-postgis.sql
@@ -44,6 +44,17 @@ CREATE TABLE Settings
     foreign key(parentId) references Settings(id)
   );
 
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     text,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
 -- ======================================================================
 
 CREATE TABLE Languages

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-postgres.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-postgres.sql
@@ -44,6 +44,17 @@ CREATE TABLE Settings
     foreign key(parentId) references Settings(id)
   );
 
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     text,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
 -- ======================================================================
 
 CREATE TABLE Languages

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-sqlserver.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/create/create-db-sqlserver.sql
@@ -44,6 +44,17 @@ CREATE TABLE Settings
     foreign key(parentId) references Settings(id)
   );
 
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     varchar(max),
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
 -- ======================================================================
 
 CREATE TABLE Languages

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql
@@ -878,7 +878,6 @@ INSERT INTO Regions VALUES (371,43.58,41.82,18.196,20.396);
 
 INSERT INTO Settings VALUES  (0,NULL,'root',NULL);
 INSERT INTO Settings VALUES (1,0,'system',NULL);
-INSERT INTO Settings VALUES (2,0,'harvesting',NULL);
 INSERT INTO Settings VALUES (10,1,'site',NULL);
 INSERT INTO Settings VALUES (11,10,'name','My GeoNetwork catalogue');
 INSERT INTO Settings VALUES (12,10,'siteId','Dummy');
@@ -993,6 +992,9 @@ INSERT INTO Settings VALUES (956,1,'hidewithheldelements',NULL);
 INSERT INTO Settings VALUES (957,956,'enable','false');
 INSERT INTO Settings VALUES (958,956,'keepMarkedElement','true');
 
+
+INSERT INTO HarvesterSettings VALUES  (1,NULL,'harvesting',NULL);
+
 -- ======================================================================
 -- === Table: Users
 -- ======================================================================

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-db2.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-db2.sql
@@ -0,0 +1,10 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     CLOB(1G),
+    primary key(id)
+  );
+
+ALTER TABLE HarvesterSettings ADD FOREIGN KEY (parentId) REFERENCES HarvesterSettings (id);
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-default.sql
@@ -0,0 +1,11 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     longvarchar,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-mysql.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-mysql.sql
@@ -0,0 +1,11 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     longtext,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-oracle.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-oracle.sql
@@ -0,0 +1,10 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar2(64)   not null,
+    value     clob,
+    primary key(id)
+  );
+
+ALTER TABLE HarvesterSettings ADD FOREIGN KEY (parentId) REFERENCES HarvesterSettings (id);
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-postgis.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-postgis.sql
@@ -0,0 +1,11 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     text,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-postgres.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-postgres.sql
@@ -0,0 +1,11 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     text,
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-sqlserver.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-db-sqlserver.sql
@@ -0,0 +1,11 @@
+CREATE TABLE HarvesterSettings
+  (
+    id        int            not null,
+    parentId  int,
+    name      varchar(64)    not null,
+    value     varchar(max),
+
+    primary key(id),
+
+    foreign key(parentId) references HarvesterSettings(id)
+  );
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v2110/migrate-default.sql
@@ -0,0 +1,12 @@
+INSERT INTO HarvesterSettings VALUES  (1,NULL,'harvesting',NULL);
+-- Copy all harvester's root nodes config
+INSERT INTO HarvesterSettings SELECT id, 1, name, value FROM Settings WHERE parentId = 2;
+-- Copy all harvester's properties (Greater than last 2.10.0 settings ie. keepMarkedElement)
+INSERT INTO HarvesterSettings SELECT * FROM Settings WHERE id > (SELECT max(id) FROM HarvesterSettings);
+-- Drop harvester config from Settings table
+DELETE FROM Settings WHERE id > 958;
+DELETE FROM Settings WHERE id=2;
+
+-- Version update
+UPDATE Settings SET value='2.11.0' WHERE name='version';
+UPDATE Settings SET value='SNAPSHOT' WHERE name='subVersion';