Settings / Remove hierarchy (#168).

geonetwork · Jul 15, 2013 · 8d4fe61 · 8d4fe61
1 parent 7df46d0
commit 8d4fe61
Show file tree

Hide file tree

Showing 46 changed files with 5,361 additions and 8,554 deletions.
diff --git a/core/src/main/java/org/fao/geonet/DatabaseMigrationTask.java b/core/src/main/java/org/fao/geonet/DatabaseMigrationTask.java
@@ -2,6 +2,7 @@
 
 import java.sql.SQLException;
 
+import org.fao.geonet.kernel.setting.HarvesterSettingsManager;
 import org.fao.geonet.kernel.setting.SettingManager;
 
 import jeeves.resources.dbms.Dbms;
@@ -12,5 +13,5 @@
  * @author jeichar
  */
 public interface DatabaseMigrationTask {
-	void update(SettingManager settings, Dbms dbms) throws SQLException;
+	void update(SettingManager settings, HarvesterSettingsManager harvesterSettingsMan, Dbms dbms) throws SQLException;
 }
diff --git a/core/src/main/java/org/fao/geonet/UpdateHarvesterIdsTask.java b/core/src/main/java/org/fao/geonet/UpdateHarvesterIdsTask.java
diff --git a/core/src/main/java/org/fao/geonet/kernel/DataManager.java b/core/src/main/java/org/fao/geonet/kernel/DataManager.java
@@ -2710,8 +2710,7 @@ public Element updateFixedInfo(String schema, String id, String uuid, Element md
                 result.addContent(md);
                 // add 'environment' to result
                 env.addContent(new Element("siteURL")   .setText(getSiteURL(context)));
-                Element system = settingMan.get("system", -1);
-                env.addContent(Xml.transform(system, appPath + Geonet.Path.STYLESHEETS+ "/xml/config.xsl"));
+                env.addContent(new Element("config").addContent(settingMan.getAllAsXML()));
                 result.addContent(env);
                 // apply update-fixed-info.xsl
                 String styleSheet = getSchemaDir(schema) + Geonet.File.UPDATE_FIXED_INFO;