Changeset 5615 for trunk/src/install

Timestamp:

Apr 19, 2011, 3:42:31 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1592: Unified installation procedure for plug-ins, extensions and more...

Added file processor for installing plug-ins as part of a scan for extensions. Trying to link information about plug-in into the tree with extensions information.

Added "disabled" property to plug-ins to make them behave more similar to extensions. There may still be synchronization issues with the in-memory information and the database information.

Changed the installation procedure somewhat to allow re-using the same code for installing plug-ins (eg. from initdb/updatedb, and scanning extensions). There are some bumps to fix yet.

File:

• trunk/src/install/net/sf/basedb/install/Webclient.java (modified) (3 diffs)

trunk/src/install/net/sf/basedb/install/Webclient.java

@@ -28 +28 @@
 import net.sf.basedb.core.Application;
 import net.sf.basedb.core.DbControl;
-import net.sf.basedb.core.Group;
-import net.sf.basedb.core.SystemItems;
 import net.sf.basedb.core.ItemKey;
-import net.sf.basedb.core.GroupPermissions;
 import net.sf.basedb.core.Permission;
 import net.sf.basedb.core.Client;
@@ -38 +35 @@
 import net.sf.basedb.core.BaseException;
 import net.sf.basedb.core.ItemNotFoundException;
-import net.sf.basedb.core.Version;
-import net.sf.basedb.core.plugin.AboutImpl;
 import net.sf.basedb.plugins.HelpImporter;
+import net.sf.basedb.util.extensions.xml.PluginInfo;
+import net.sf.basedb.util.extensions.xml.XmlLoader;
 
 import java.io.InputStream;
 import java.net.URL;
-import java.util.EnumSet;
 
 /**
@@ -99 +95 @@
     
     DbControl dc = sc.newDbControl();
-    Group everyone = Group.getById(dc, SystemItems.getId(Group.EVERYONE));
-    GroupPermissions gp = new GroupPermissions();
-    gp.setPermissions(everyone, EnumSet.of(Permission.USE));
-    ItemKey everyoneUse = ItemKey.getNewOrExisting(dc, null, gp);
+    try
+    {
+      ItemKey shareToEveryone = ItemKey.getShareToEveryOneKey(dc, Permission.USE);
+      
+      Client client = null;
+      try
+      {
+        client = Client.getByExternalId(dc, "net.sf.basedb.clients.web");
+      }
+      catch (ItemNotFoundException ex)
+      {
+        client = Client.getNew(dc, "net.sf.basedb.clients.web");
+        client.setName("Web client");
+        client.setDescription("The web interface to BASE");
+        client.setItemKey(shareToEveryone);
+        dc.saveItem(client);
+      }
+  
+      String latinText = "Fusce consectetuer. Suspendisse consectetuer wisi vitae eros. Quisque sapien sapien, "+
+        "lobortis a, congue sed, tempus vitae, sapien. Aliquam rhoncus ultricies pede. Fusce "+
+        "gravida pharetra tellus. Nulla tortor. Donec eu enim. Vivamus blandit. Pellentesque "+
+        "habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris "+
+        "pulvinar arcu id libero. Vestibulum pharetra. Proin id felis pharetra mauris feugiat adipiscing. "+
+        "Cras auctor. Nullam turpis. Cras dignissim venenatis erat.<br>\n"+
+        "[<b>The server administrator should replace this text, or remove it to disable this feature</b>]";
+  
+      createSetting(client, "server.about", latinText);
+      createSetting(client, "server.admin.name", adminName);
+      createSetting(client, "server.admin.email", adminEmail);
+      createSetting(client, "server.forgotten.password", latinText);
+      createSetting(client, "server.get.account", latinText);
+      createSetting(client, "server.transferRate", Integer.toString(100 * 1024 * 1024)); // 100MB/s
+      createSetting(client, "server.links.reportbug", "http://base.thep.lu.se/#Feedback");
+      createSetting(client, "server.links.help", "http://base.thep.lu.se/chrome/site/doc/html/index.html");
+      createSetting(client, "server.links.faq", "");
+      
+      URL fileURL = Webclient.class.getResource("/web-extensions.xml");
+      
+      XmlLoader loader = new XmlLoader();
+      try
+      {
+        InputStream in = fileURL.openStream();
+        loader.loadXmlFile(in, "/web-extensions.xml", null, false);
+      }
+      catch (Exception ex)
+      {
+        throw new BaseException(ex);
+      }
+      
+      for (PluginInfo info : loader.getPluginDefinitions())
+      {
+        PluginDefinition.installOrUpdate(dc, info, null, shareToEveryone);
+      }
+      dc.commit();
+      installHelpTexts(sc, client);
+    }
+    finally
+    {
+      if (dc != null) dc.close();
+    }
     
-    Client client = null;
-    try
-    {
-      client = Client.getByExternalId(dc, "net.sf.basedb.clients.web");
-    }
-    catch (ItemNotFoundException ex)
-    {
-      client = Client.getNew(dc, "net.sf.basedb.clients.web");
-      client.setName("Web client");
-      client.setDescription("The web interface to BASE");
-      client.setItemKey(everyoneUse);
-      dc.saveItem(client);
-    }
-
-    String latinText = "Fusce consectetuer. Suspendisse consectetuer wisi vitae eros. Quisque sapien sapien, "+
-      "lobortis a, congue sed, tempus vitae, sapien. Aliquam rhoncus ultricies pede. Fusce "+
-      "gravida pharetra tellus. Nulla tortor. Donec eu enim. Vivamus blandit. Pellentesque "+
-      "habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Mauris "+
-      "pulvinar arcu id libero. Vestibulum pharetra. Proin id felis pharetra mauris feugiat adipiscing. "+
-      "Cras auctor. Nullam turpis. Cras dignissim venenatis erat.<br>\n"+
-      "[<b>The server administrator should replace this text, or remove it to disable this feature</b>]";
-
-    createSetting(client, "server.about", latinText);
-    createSetting(client, "server.admin.name", adminName);
-    createSetting(client, "server.admin.email", adminEmail);
-    createSetting(client, "server.forgotten.password", latinText);
-    createSetting(client, "server.get.account", latinText);
-    createSetting(client, "server.transferRate", Integer.toString(100 * 1024 * 1024)); // 100MB/s
-    createSetting(client, "server.links.reportbug", "http://base.thep.lu.se/#Feedback");
-    createSetting(client, "server.links.help", "http://base.thep.lu.se/chrome/site/doc/html/index.html");
-    createSetting(client, "server.links.faq", "");
-      
-    PluginDefinition simpleExport = null;
-    String simpleExportClassName = "net.sf.basedb.clients.web.plugins.SimpleExport";
-    try
-    {
-      simpleExport = PluginDefinition.getByClassName(dc, simpleExportClassName);
-      simpleExport.loadPluginInformation(null, simpleExportClassName, true);
-    }
-    catch (ItemNotFoundException ex)
-    {
-      simpleExport = PluginDefinition.getNew(dc, simpleExportClassName, null, true);
-      simpleExport.setItemKey(everyoneUse);
-      simpleExport.setAllowImmediateExecution(true);
-      dc.saveItem(simpleExport); 
-    }
-    
-    simpleExport.setAbout(
-        new AboutImpl
-        (
-            "Table exporter",
-            "Export all table listings in the web interface as tab-separated text files " +
-            "or as XML. This plugin only works from within the web client, since it depends " +
-            "on context and table information.",
-            Version.getMajor() + "." + Version.getMinor() + "." + Version.getMaintenance(),
-            "2006, Base 2 development team",
-            null,
-            null,
-            "http://base.thep.lu.se"
-          ), false);
-    
-    dc.commit();
-    
-    installHelpTexts(sc, client);
   }