Changeset 5617

Timestamp:

Apr 28, 2011, 8:09:11 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

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

Added support for installing plug-in configurations. The file we are looking for has changed to META-INF/plugin-configurations.xml

Moved duplicates of the installation code to the PluginConfiguration class (from the Install class and PluginConfigurationImporter).

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java (modified) (2 diffs)
• core/net/sf/basedb/core/Application.java (modified) (2 diffs)
• core/net/sf/basedb/core/Install.java (modified) (4 diffs)
• core/net/sf/basedb/core/PluginConfiguration.java (modified) (4 diffs)
• core/net/sf/basedb/core/Update.java (modified) (2 diffs)
• core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java (modified) (1 diff)
• core/net/sf/basedb/util/extensions/manager/ExtensionsManager.java (modified) (3 diffs)
• core/net/sf/basedb/util/extensions/manager/processor/PluginInstallationProcessor.java (modified) (9 diffs)
• core/net/sf/basedb/util/extensions/xml/PluginDefinitionFilter.java (added)
• install/net/sf/basedb/install/Webclient.java (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java (modified) (10 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/ExtensionsControl.java

@@ -68 +68 @@
 import net.sf.basedb.util.extensions.xml.ExtensionPointFilter;
 import net.sf.basedb.util.extensions.xml.PluginInfo;
-import net.sf.basedb.util.extensions.xml.XmlLoader;
 import net.sf.basedb.util.filter.Filter;
 
@@ -255 +254 @@
 
       // 2b. Load plug-in definitions information
-      PluginInstallationProcessor pluginInstaller = new PluginInstallationProcessor(dc, new XmlLoader(), results);
+      PluginInstallationProcessor pluginInstaller = new PluginInstallationProcessor(dc, results);
       manager.processFiles(pluginInstaller, installFilter);
       numInstalledPlugins = pluginInstaller.getNumPlugins();

trunk/src/core/net/sf/basedb/core/Application.java

@@ -553 +553 @@
   
         // Initialize extensions system 
-        // TODO -- should this be moved to a utility class? Probably...
+        boolean extensionsAreDisabled = Config.getBoolean("extensions.disabled");
         Registry xtRegistry = new Registry();
         java.io.File xtSettings = new java.io.File(userFilesDirectory, "extension-settings.xml");
@@ -562 +562 @@
         // Add core plug-ins
         xtManager.addURI(Application.class.getResource("/core-plugins.xml").toURI());
-        
-        if (!Config.getBoolean("extensions.disabled"))
-        {
-          // Add plugins directory to the manager (unless disabled)
-          xtManager.addDirectory(pluginsDirectory);
-        }
+        // Add plugins directory to the manager (unless disabled)
+        if (!extensionsAreDisabled) xtManager.addDirectory(pluginsDirectory);
         
         // Register and load core extensions only

trunk/src/core/net/sf/basedb/core/Install.java

@@ -168 +168 @@
     try
     {
+      Config.setProperty("extensions.disabled", "true");
       Application.start(false, false, false);
       session = HibernateUtil.newSession();
@@ -2503 +2504 @@
     Create {@link PluginConfiguration}s from a XML file.
   */
+  @SuppressWarnings("unchecked")
   private static void createPluginConfigurations(String filePath, boolean update)
     throws BaseException
@@ -2527 +2529 @@
       }
       
-      URL dtdURL = Install.class.getResource("/net/sf/basedb/core/dtd/plugin-configuration-file.dtd");
-      URL fileURL = Install.class.getResource(filePath);
-      Document doc = XMLUtil.getValidatedXml(fileURL, dtdURL);
-      Element rootElement = doc.getRootElement();   
-      
-      List configurations = rootElement.getChildren();
-      
-      for (Object obj : configurations)
-      {
-        Element configuration = (Element)obj;
+      List<Element> configurations = PluginConfiguration.loadXmlFile(Install.class.getResource(filePath).openStream(), filePath);
+      
+      for (Element configuration : configurations)
+      {
         String name = configuration.getChildText("configname");
         String description = configuration.getChildText("description");
@@ -2560 +2556 @@
         try
         {
-          PluginDefinition pluginDefinition = PluginDefinition.getByClassName(dc, pluginClassName);
+          PluginDefinition plugin = PluginDefinition.getByClassName(dc, pluginClassName);
                               
           // Create a new plugin configurationj
-          PluginConfiguration pluginConfig = PluginConfiguration.getNew(dc, pluginDefinition);  
-          pluginConfig.setItemKey(pluginDefinition.getItemKey());
-          pluginConfig.setProjectKey(pluginDefinition.getProjectKey());
-          dc.saveItem(pluginConfig);
-          pluginConfig.setName(name);
-          pluginConfig.setDescription(description);
-          
-          // Get the confiuration parameters from file
-          List parameters = configuration.getChildren("parameter");
-          for (Object elementObj : parameters)
-          { 
-            Element parameter = (Element)elementObj;
-            String parametername = parameter.getChildText("name");                
-            String cl = parameter.getChildText("class"); 
-            String label = parameter.getChildText("label").length() > 0 ? parameter.getChildText("label") : name;         
-            Class clazz = null;
-            List<Object> values = new ArrayList<Object>() ;
-            
-            if (cl.length() > 0)
-            { 
-              clazz = Class.forName(cl);
-              List children = parameter.getChildren("value");
-              // Get the parameter values
-              for (Object ch : children)
-              {
-                String text = ((Element)ch).getText();
-                if (clazz.equals(Boolean.class)) values.add(Boolean.valueOf(text));
-                else if (clazz.equals(Date.class)) values.add(DateUtil.parseString(text));
-                else if (clazz.equals(Double.class)) values.add(new Double(text));
-                else if (clazz.equals(Float.class)) values.add(new Float(text));
-                else if (clazz.equals(Long.class)) values.add(new Long(text));
-                else if (clazz.equals(String.class)) values.add(text);
-              }   
-              // Get the parametertype
-              ParameterType pType;
-              if (clazz.equals(Boolean.class)) pType = new BooleanParameterType();
-              else if (clazz.equals(Date.class)) pType =  new DateParameterType();
-              else if (clazz.equals(Double.class)) pType =  new DoubleParameterType();    
-              else if (clazz.equals(Float.class)) pType =  new FloatParameterType();
-              else if (clazz.equals(Integer.class)) pType =  new IntegerParameterType();    
-              else if (clazz.equals(Long.class)) pType =  new LongParameterType();
-              else if (clazz.equals(String.class)) pType =  new StringParameterType();
-              else pType = null;
-              pluginConfig.setParameterValues(parametername,label, "", pType, values);
-            }
-          }         
+          PluginConfiguration config = PluginConfiguration.getNew(dc, plugin);  
+          config.setItemKey(plugin.getItemKey());
+          config.setProjectKey(plugin.getProjectKey());
+          dc.saveItem(config);
+          config.setName(name);
+          config.setDescription(description);
+          config.setParameterValues((List<Element>)configuration.getChildren("parameter"));
         }       
         catch(Throwable ex)

trunk/src/core/net/sf/basedb/core/PluginConfiguration.java

@@ -35 +35 @@
 import net.sf.basedb.core.query.Hql;
 import net.sf.basedb.core.query.Expressions;
-
+import net.sf.basedb.util.XMLUtil;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
@@ -42 +47 @@
 import java.util.Set;
 import java.util.Collections;
+
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
 
 /**
@@ -165 +174 @@
     }
     return query;
+  }
+
+  /**
+    Load a configurations xml file from the given stream.
+    @param in The input stream to read from
+    @param fileName The name of the originating file (optional)
+    @return A list with all <configuration> elements in the file
+    @since 3.0
+  */
+  @SuppressWarnings("unchecked")
+  public static List<Element> loadXmlFile(InputStream in, String fileName)
+    throws IOException, JDOMException
+  {
+    URL dtdURL = PluginConfiguration.class.getResource("/net/sf/basedb/core/dtd/plugin-configuration-file.dtd");
+    Document doc = XMLUtil.getValidatedXML(in, dtdURL, fileName);
+    Element rootElement = doc.getRootElement();
+    return (List<Element>)rootElement.getChildren();
   }
 
@@ -666 +692 @@
   
 
+  /**
+    Sets parameters for a PluginConfiguration from the elements in a xml
+    configurations file.
+    
+      @param parameters A list of the parameters that shall be set to the configuration
+      @throws ClassNotFoundException If there is an error while trying to find the type of the parameters.
+      @since 3.0
+  */
+  @SuppressWarnings("unchecked")
+  public void setParameterValues(List<Element> parameters)
+    throws ClassNotFoundException
+  {
+    checkPermission(Permission.WRITE);
+    // Set each configuration parameter for the plugin.
+    for (Element parameter : parameters)
+    { 
+      String name = parameter.getChildText("name");               
+      String cl = parameter.getChildText("class"); 
+      String label = parameter.getChildText("label");
+      if (label == null || label.length() == 0) label = name;   
+      String description = parameter.getChildText("description");
+      Class clazz = null;
+      List values = null;
+      
+      if (cl.length() > 0)
+      {
+        clazz = Class.forName(cl);
+        values = getValueList(parameter, clazz);
+        ParameterType pType = getParameterType(clazz, values);
+        setParameterValues(name,label, description, pType, values);
+      }
+    }
+  }
+  
+  /**
+      Gets the list of values for a parameter from the XML-file.
+      Returns a list with parameter values.
+  */  
+  @SuppressWarnings("unchecked")
+  private <T> List<T> getValueList(Element parameter, Class<T> classType)
+  { 
+    List<Element> children = (List<Element>)parameter.getChildren("value");
+    List<T> values = new ArrayList<T>();
+    for (Object ch : children)
+    {
+      String text = ((Element)ch).getText();
+      if (classType.equals(Boolean.class)) values.add((T)Boolean.valueOf(text));
+      else if (classType.equals(Date.class)) values.add((T)DateUtil.parseString(text));
+      else if (classType.equals(Double.class)) values.add((T)Double.valueOf(text));
+      else if (classType.equals(Float.class)) values.add((T)Float.valueOf(text));
+      else if (classType.equals(Long.class)) values.add((T)Long.valueOf(text));
+      else if (classType.equals(String.class)) values.add((T)text);
+    }
+    return values;
+  }
+  
+  /**
+      Gets the ParameterType to use with a class.
+      Returns null if this importer doesn't support the class.
+  */ 
+  @SuppressWarnings("unchecked")
+  private <T> ParameterType<T> getParameterType(Class<T> parameterClass, List<?> values)
+  {
+    int multiplicity = 1;
+    if (values != null && values.size() > 1) multiplicity = values.size();
+    ParameterType pType = null;
+    
+    if (parameterClass.equals(Boolean.class))
+    {
+      pType = new BooleanParameterType(null, false, multiplicity, null);
+    }
+    else if (parameterClass.equals(Date.class)) 
+    {
+      pType = new DateParameterType(null, false, multiplicity, 0, 0, null);
+    }
+    else if (parameterClass.equals(Double.class)) 
+    {
+      pType = new DoubleParameterType(null, null, null, false, multiplicity, 0, 0, null);   
+    }
+    else if (parameterClass.equals(Float.class)) 
+    {
+      pType = new FloatParameterType(null, null, null, false, multiplicity, 0, 0, null);
+    }
+    else if (parameterClass.equals(Integer.class))
+    {
+      pType = new IntegerParameterType(null, null, null, false, multiplicity, 0, 0, null);    
+    }
+    else if (parameterClass.equals(Long.class)) 
+    {
+      pType = new LongParameterType(null, null, null, false, multiplicity, 0, 0, null);
+    }
+    else if (parameterClass.equals(String.class)) 
+    {
+      // Find longest string
+      int maxLength = 255;
+      if (values != null && !values.isEmpty())
+      {
+        for (Object obj : values)
+        {
+          if (obj instanceof String)
+          {
+            String str = obj.toString();
+            if (str.length() > maxLength) maxLength = str.length();
+          }
+        }
+      }
+      pType = new StringParameterType(maxLength, null, false, multiplicity, 0, 0);
+    }
+    return pType;
+  }
+
+  
 }

trunk/src/core/net/sf/basedb/core/Update.java

@@ -73 +73 @@
     try
     {
+      Config.setProperty("extensions.disabled", "true");
       Application.start(false, false, false);
 
@@ -192 +193 @@
       try
       {
+        Config.setProperty("extensions.disabled", "true");
         Application.start(false, false, false);
   

trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsFile.java

@@ -385 +385 @@
 
   /**
+    Get an input stream for reading the resource specified by the
+    given path
+    @param path The path of the resource
+    @return An input stream (or null if this extensions file is not a JAR file or if the given path is not found)
+    @throws IOException
+  */
+  public InputStream getStream(String path)
+    throws IOException
+  {
+    InputStream in = null;
+    if (isJar())
+    {
+      final ZipFile zipFile = new ZipFile(getFile());
+      ZipEntry zipEntry = zipFile.getEntry(path);
+      if (zipEntry != null)
+      {
+        in = new CloseResourceInputStream(zipFile.getInputStream(zipEntry), 
+          new Closeable()
+          {
+            // Make sure the zip file is closed when the returned stream is closed
+            @Override
+            public void close() 
+              throws IOException
+            {
+              zipFile.close();
+            }
+          }
+        );
+      }
+    }
+    return in;
+  }
+
+  
+  /**
     Validate the XML file with the extension definitions.
   */

trunk/src/core/net/sf/basedb/util/extensions/manager/ExtensionsManager.java

@@ -91 +91 @@
     this.installedObjects = new HashMap<ObjectKey<?>, ExtensionsFile>();
     addIgnore(settingsFile);
-    // Add installed files
-    for (File f : settings.getInstalledFiles())
-    {
-      ExtensionsFile xtFile = new ExtensionsFile(this, f);
-      addExtensionsFile(xtFile);
-    }
   }
   
@@ -142 +136 @@
   /**
     Add a directory to this manager. The directory will be monitored
-    for extension files in the future. 
+    for extension files in the future. Files in the directory that
+    are installed as per the settings {@link Settings#isInstalledFile(File)}
+    are loaded into manager. 
     <p>
-    This method call is ignored if the 
-    path is not pointing to an existing directory.
+    This method call is ignored if the path is not pointing to an
+    existing directory.
     
     @param dir An existing directory
     @return The number of files in the directory that was
-      not previously known to the manager
-  */
-  public synchronized void addDirectory(File dir)
+      installed
+  */
+  public synchronized int addDirectory(File dir)
   {
     if (dir == null) throw new NullPointerException("dir");
-    if (!dir.isDirectory()) return;
+    if (!dir.isDirectory()) return 0;
     directories.add(dir);
+    return scanForInstalledFiles(dir, settings);
   }
   
@@ -372 +369 @@
   
   /**
+    Scan the given directory and add files that are installed
+    according to the settings.
+    @param dir The directory to scan
+    @return The number of installed files in the given directory
+  */
+  private int scanForInstalledFiles(File dir, Settings settings)
+  {
+    int numInstalled = 0;
+    
+    if (!dir.isDirectory()) 
+    {
+      log.warn("File '" + dir + "' is not a directory. Ignoring.");
+      return numInstalled;
+    }
+  
+    log.info("Scanning directory: " + dir);
+    FileFilter filter = new RegexpFileFilter(".*\\.(xml|jar)", "");
+    File[] files = dir.listFiles(filter);
+    
+    if (files != null && files.length > 0)
+    {
+      log.debug("Found " + files.length + " files");
+      for (File file : files)
+      {
+        if (ignore.contains(file))
+        {
+          log.debug("File '" + file + "' is ignored.");
+          continue; // with the next file
+        }
+        
+        URI uri = file.toURI();
+        ExtensionsFile xtFile = xtFiles.get(uri);
+        if (xtFile != null)
+        {
+          log.debug("File '" + xtFile + "' is a known file.");
+        }
+        else if (settings.isInstalledFile(file))
+        {
+          log.debug("Adding installed file: " + file);
+          xtFile = new ExtensionsFile(this, file);
+          addExtensionsFile(xtFile);
+          numInstalled++;
+        }
+        else
+        {
+          log.debug("File '" + file + "' is not installed.");
+        }
+      }
+      log.info("Found " + numInstalled + " new *.xml and *.jar files");
+    }
+    else
+    {
+      log.info("Found no *.xml or *.jar files");
+    }
+    return numInstalled;
+  }
+
+  
+  /**
     Get a list of all extension files managed by this manager.
     @return A list

trunk/src/core/net/sf/basedb/util/extensions/manager/processor/PluginInstallationProcessor.java

@@ -23 +23 @@
 
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import org.jdom.Element;
 
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.ItemKey;
+import net.sf.basedb.core.ItemQuery;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.PluginConfiguration;
 import net.sf.basedb.core.PluginDefinition;
+import net.sf.basedb.core.Type;
+import net.sf.basedb.core.query.Expressions;
+import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.util.FileUtil;
 import net.sf.basedb.util.extensions.manager.ExtensionsFile.WriteableExtensionsFile;
@@ -36 +46 @@
 import net.sf.basedb.util.extensions.manager.PluginInfoKey;
 import net.sf.basedb.util.extensions.manager.ProcessResults;
+import net.sf.basedb.util.extensions.xml.PluginDefinitionFilter;
 import net.sf.basedb.util.extensions.xml.PluginInfo;
 import net.sf.basedb.util.extensions.xml.XmlLoader;
@@ -67 +78 @@
       (if not given, only the information from the XML files are loaded,
       the plug-ins are not installed)
-    @param loader The XML loader to use when parsing the metadata
-  */
-  public PluginInstallationProcessor(DbControl dc, XmlLoader loader, ProcessResults results)
+  */
+  public PluginInstallationProcessor(DbControl dc, ProcessResults results)
   {
     this.dc = dc;
-    this.loader = loader;
+    this.loader = new XmlLoader();
     this.results = results;
   }
@@ -86 +96 @@
     this.numError = 0;
     this.numTotalPlugins = 0;
-  }
-
+    loader.setFilter(new PluginDefinitionFilter());
+  }
+
+  @SuppressWarnings("unchecked")
   @Override
   public void processFile(ExtensionsManager manager, WriteableExtensionsFile wFile) 
@@ -96 +108 @@
     try
     {
-      log.info("Loading extensions from file: " + xtFile);
+      log.info("Loading plug-in definitions from file: " + xtFile);
       
       in = xtFile.getXmlStream();
       loader.loadXmlFile(in, xtFile.getName(), xtFile.getClassLoader(), true);
+      FileUtil.close(in);
       List<PluginInfo> plugins = loader.getPluginDefinitions();
       
@@ -105 +118 @@
       int numUpdated = 0;
       int numProcessed = 0;
+      int numConfigurations = 0;
+      Map<String, PluginDefinition> allPlugins = new HashMap<String, PluginDefinition>();
       if (plugins.size() > 0)
       {
@@ -122 +137 @@
           {
             PluginDefinition plugin = PluginDefinition.installOrUpdate(dc, info, jarFile, shareToEveryone);
+            allPlugins.put(info.getClassName(), plugin);
             if (plugin.isInDatabase())
             {
@@ -136 +152 @@
       }
       
+      // Load plug-in configurations
+      if (dc != null)
+      {
+        in = xtFile.getStream("META-INF/plugin-configurations.xml");
+        if (in != null)
+        {
+          List<Element> configurations = PluginConfiguration.loadXmlFile(in, "META-INF/plugin-configurations.xml");
+          FileUtil.close(in);
+          for (Element configuration : configurations)
+          {
+            String name = configuration.getChildText("configname");
+            String description = configuration.getChildText("description");
+            String pluginClassName = configuration.getAttributeValue("pluginClassName");
+            
+            PluginDefinition plugin = allPlugins.get(pluginClassName);
+            if (plugin != null)
+            {
+              PluginConfiguration config = null;
+              if (plugin.isInDatabase())
+              {
+                ItemQuery<PluginConfiguration> query = plugin.getPluginConfigurations();
+                query.restrict(Restrictions.eq(Hql.property("name"), Expressions.parameter("name", name, Type.STRING)));
+                List<PluginConfiguration> existing = query.list(dc);
+                if (existing.size() == 0)
+                {
+                  config = plugin.newPluginConfiguration();
+                }
+              }
+              else
+              {
+                config = plugin.newPluginConfiguration();
+              }
+              if (config != null && !config.isInDatabase())
+              {
+                dc.saveItem(config);
+                config.setItemKey(plugin.getItemKey());
+                config.setProjectKey(plugin.getProjectKey());
+                config.setName(name);
+                config.setDescription(description);
+                config.setParameterValues((List<Element>)configuration.getChildren("parameter"));
+                numConfigurations++;
+              }
+            }
+  
+          }
+        }
+      }
+      
       numFiles++;
       numTotalPlugins += numInstalled + numUpdated;
@@ -142 +206 @@
         if (numInstalled > 0) results.addMessage(xtFile, numInstalled + " plug-in(s) installed.");
         if (numUpdated > 0) results.addMessage(xtFile, numUpdated + " plug-in(s) updated.");
+        if (numConfigurations > 0) results.addMessage(xtFile, numConfigurations + " plug-in configuration(s) created");
         if (numInstalled == 0 && numUpdated == 0 && numProcessed > 0)
         {

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

@@ -90 +90 @@
     throws BaseException
   {
+    Config.setProperty("extensions.disabled", "true");
     Application.start(false);
     SessionControl sc = Application.newSessionControl(null, null, null);

trunk/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java

@@ -26 +26 @@
 import net.sf.basedb.core.BaseException;
 import net.sf.basedb.core.BooleanParameterType;
-import net.sf.basedb.core.DateParameterType;
-import net.sf.basedb.core.DateUtil;
 import net.sf.basedb.core.DbControl;
-import net.sf.basedb.core.DoubleParameterType;
 import net.sf.basedb.core.File;
 import net.sf.basedb.core.FileParameterType;
-import net.sf.basedb.core.FloatParameterType;
-import net.sf.basedb.core.IntegerParameterType;
 import net.sf.basedb.core.InvalidDataException;
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.ItemContext;
 import net.sf.basedb.core.ItemNotFoundException;
-import net.sf.basedb.core.LongParameterType;
-import net.sf.basedb.core.ParameterType;
 import net.sf.basedb.core.PluginConfiguration;
 import net.sf.basedb.core.PluginDefinition;
@@ -45 +38 @@
 import net.sf.basedb.core.ProgressReporter;
 import net.sf.basedb.core.RequestInformation;
-import net.sf.basedb.core.StringParameterType;
 import net.sf.basedb.core.plugin.AbstractPlugin;
 import net.sf.basedb.core.plugin.AutoDetectingImporter;
@@ -56 +48 @@
 import net.sf.basedb.core.signal.SignalTarget;
 import net.sf.basedb.core.signal.ThreadSignalHandler;
-import net.sf.basedb.util.XMLUtil;
+import net.sf.basedb.util.FileUtil;
 
 import java.io.BufferedReader;
@@ -62 +54 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -75 +65 @@
 import java.util.jar.JarFile;
 
-import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
@@ -340 +329 @@
   }
 
+  @SuppressWarnings("unchecked")
   public void doImport(InputStream in, ProgressReporter progress) 
     throws BaseException
@@ -353 +343 @@
         filePath = f.getPath().toString();
       }
-      //Get the root element of the XML file
-      URL dtdURL = PluginConfigurationImporter.class.getResource("/net/sf/basedb/core/dtd/"+dtdFileName);
-      Document doc = XMLUtil.getValidatedXML(in, dtdURL, filePath);   
-      Element rootElement = doc.getRootElement();   
       
+      List<Element> configurations = PluginConfiguration.loadXmlFile(in, filePath);
       int parameternumber = 0;
-      List configurations = rootElement.getChildren();
-      for (Object obj : configurations)
+      for (Element configuration : configurations)
       {
         ThreadSignalHandler.checkInterrupted();
-        Element configuration = (Element)obj;
         String name = configuration.getChildText("configname");
         String description = configuration.getChildText("description");
         String pluginClassName = configuration.getAttributeValue("pluginClassName");
-        PluginDefinition pluginDefinition = null;
+        PluginDefinition plugin = null;
         try 
         {
-          pluginDefinition = PluginDefinition.getByClassName(dc, pluginClassName);
+          plugin = PluginDefinition.getByClassName(dc, pluginClassName);
           
-          boolean importConfiguration = !importAll && getConfigurationInstallOption(parameternumber);
-          if ((importConfiguration || importAll))
+          boolean importConfiguration = importAll || getConfigurationInstallOption(parameternumber);
+          if (importConfiguration)
           {
-            PluginConfiguration pluginConfig = PluginConfiguration.getNew(dc, pluginDefinition);
+            PluginConfiguration config = PluginConfiguration.getNew(dc, plugin);
             if (setPermissions)
             {
-              pluginConfig.setItemKey(pluginDefinition.getItemKey());
-              pluginConfig.setProjectKey(pluginDefinition.getProjectKey());
+              config.setItemKey(plugin.getItemKey());
+              config.setProjectKey(plugin.getProjectKey());
             }
-            pluginConfig.setName(name);
-            pluginConfig.setDescription(description);
-            dc.saveItem(pluginConfig);
-            
-            List parameters = configuration.getChildren("parameter");
-            setPluginConf(parameters, pluginConfig);
+            config.setName(name);
+            config.setDescription(description);
+            config.setParameterValues((List<Element>)configuration.getChildren("parameter"));
+            dc.saveItem(config);
           }
         }
@@ -486 +469 @@
       
       DbControl dc = null;
-      
+      InputStream in = null;
       try
       {
         dc = sc.newDbControl();
         //Get the root element of the XML file
-        String filePath = null;
         File file = (File)job.getValue("xmlfile");
-        {
-          file = File.getById(dc, file.getId());
-          filePath = file.getPath().toString();
-        }
-        URL dtdURL = PluginConfigurationImporter.class.getResource("/net/sf/basedb/core/dtd/"+dtdFileName);
-        InputStream is = file.getDownloadStream(0);
-        Document doc = XMLUtil.getValidatedXML(is, dtdURL, filePath);
-        is.close();
-        Element rootElement = doc.getRootElement();
+        file = File.getById(dc, file.getId());
+        String filePath = file.getPath().toString();
+        
+        in = file.getDownloadStream(0);
+        List<Element> configurations = PluginConfiguration.loadXmlFile(in, filePath);
+        FileUtil.close(in);
         
         List<PluginParameter<?>> typeList = null;
-        List configurations = rootElement.getChildren();
         int parameternumber = 0;
         for (Object obj : configurations)
@@ -564 +542 @@
       finally
       {
-        if (dc != null)
-        {
-          dc.close();
-        }
+        if (dc != null) dc.close();
+        FileUtil.close(in);
       }
     }
     return configureSelection;
-  }
-  
-  /**
-      Gets the list of values for a parameter from the XML-file.
-      Returns a list with parameter values.
-  */  
-  private List getValueList(Element parameter, Class classType)
-  { 
-    List children = parameter.getChildren("value");
-    List<Object> values = new ArrayList<Object>();
-    for (Object ch : children)
-    {
-      String text = ((Element)ch).getText();
-      if (classType.equals(Boolean.class)) values.add(Boolean.valueOf(text));
-      else if (classType.equals(Date.class)) values.add(DateUtil.parseString(text));
-      else if (classType.equals(Double.class)) values.add(Double.parseDouble(text));
-      else if (classType.equals(Float.class)) values.add(Float.parseFloat(text));
-      else if (classType.equals(Long.class)) values.add(Long.parseLong(text));
-      else if (classType.equals(String.class)) values.add(text);
-    }   
-    return values;
-  }
-  
-  /**
-      Gets the ParameterType to use with a class.
-      Returns null if this importer doesn't support the class.
-  */ 
-  private ParameterType getParameterType(Class parameterClass, List<?> values)
-  {
-    int multiplicity = 1;
-    if (values != null && values.size() > 1) multiplicity = values.size();
-    ParameterType pType = null;
-    
-    if (parameterClass.equals(Boolean.class))
-    {
-      pType = new BooleanParameterType(null, false, multiplicity, null);
-    }
-    else if (parameterClass.equals(Date.class)) 
-    {
-      pType = new DateParameterType(null, false, multiplicity, 0, 0, null);
-    }
-    else if (parameterClass.equals(Double.class)) 
-    {
-      pType = new DoubleParameterType(null, null, null, false, multiplicity, 0, 0, null);   
-    }
-    else if (parameterClass.equals(Float.class)) 
-    {
-      pType = new FloatParameterType(null, null, null, false, multiplicity, 0, 0, null);
-    }
-    else if (parameterClass.equals(Integer.class))
-    {
-      pType = new IntegerParameterType(null, null, null, false, multiplicity, 0, 0, null);    
-    }
-    else if (parameterClass.equals(Long.class)) 
-    {
-      pType = new LongParameterType(null, null, null, false, multiplicity, 0, 0, null);
-    }
-    else if (parameterClass.equals(String.class)) 
-    {
-      // Find longest string
-      int maxLength = 255;
-      if (values != null && !values.isEmpty())
-      {
-        for (Object obj : values)
-        {
-          if (obj instanceof String)
-          {
-            String str = obj.toString();
-            if (str.length() > maxLength) maxLength = str.length();
-          }
-        }
-      }
-      pType = new StringParameterType(maxLength, null, false, multiplicity, 0, 0);
-    }
-    return pType;
-  }
-  
-  /**
-    Sets parameters for a PluginConfiguration
-      @param parameters A list of the parameters that shall be set to the configuration
-      @param plc The @link{PluginConfiguration} that the parameters shall be added to.
-      @throws ClassNotFoundException If there is an error while trying to find the type of the parameters.
-  */
-  private void setPluginConf(List parameters, PluginConfiguration plc)
-    throws ClassNotFoundException
-  {
-    // Set each configuration parameter for the plugin.
-    for (Object elementObj : parameters)
-    { 
-      Element parameter = (Element)elementObj;
-      String name = parameter.getChildText("name");               
-      String cl = parameter.getChildText("class"); 
-      String label = parameter.getChildText("label");
-      if (label == null || label.length() == 0) label = name;   
-      String description = parameter.getChildText("description");
-      Class clazz = null;
-      List<?> values = null;
-      
-      if (cl.length() > 0)
-      { 
-        clazz = Class.forName(cl);
-        values = getValueList(parameter, clazz);
-        ParameterType pType = getParameterType(clazz, values);
-        plc.setParameterValues(name,label, description, pType, values);
-      }
-    }
   }
   
@@ -689 +559 @@
     if (configurationMap != null)
     {
-      Boolean value = configurationMap.get(orderNumber);
-      importIt = value != null ? value : false;
+      importIt = Boolean.TRUE.equals(configurationMap.get(orderNumber));
     }
     else if (job != null)
     {
-      importIt = job.getValue("configuration"+orderNumber) != null ? 
-          Boolean.TRUE.equals(job.getValue("configuration" + orderNumber)) : false;
+      importIt = Boolean.TRUE.equals(job.getValue("configuration" + orderNumber));
     }