Changeset 4115

Timestamp:

Jan 31, 2008, 1:55:48 PM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #912 Plugin auto-install can not perform import when not all configurations in the import file are selected

Location:

trunk

Files:

• src/core/net/sf/basedb/util/PluginConfigInfo.java (modified) (5 diffs)
• src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java (modified) (1 diff)
• www/admin/plugindefinitions/index.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/util/PluginConfigInfo.java

@@ -29 +29 @@
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 
 import org.jdom.Document;
@@ -58 +59 @@
   
   /**
+    In which place the configuration comes in the file.
+    This is <0 if it hasn't been defined.
+   */
+  private int orderInXml = -1;
+  
+  
+  /**
     Constructor to create a new instance with information for a plugin configuration.
       @param pluginClassName The class name of PluginDefinition this configuration belongs to, 
@@ -83 +91 @@
   {
     List<PluginConfigInfo> configInfo = new ArrayList<PluginConfigInfo>();    
-    Iterator configs = doc.getRootElement().getChildren().iterator();   
+    ListIterator configs = doc.getRootElement().getChildren().listIterator();   
     while (configs.hasNext())
     {     
-      Object obj = configs.next();
+      int order = configs.nextIndex();
+      Object obj = configs.next();      
       if (Element.class.isInstance(obj))
       {
@@ -95 +104 @@
           if (pluginClassName != null && configurationName != null)
           {
-            configInfo.add(new PluginConfigInfo(pluginClassName, configurationName, e.getChildText("description")));
+            PluginConfigInfo info = new PluginConfigInfo(pluginClassName, configurationName, e.getChildText("description"));
+            info.orderInXml = order;
+            configInfo.add(info);
           }
         }
@@ -129 +140 @@
     return description;
   }
+
+  /** Gets in wich order the configuration comes in the import file.
+    @return Returns order/position in the xml file or <0 if not defined.
+  */
+  public int getOrderInXml()
+  {
+    return orderInXml;
+  }
 }

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

@@ -436 +436 @@
     this.configurationMap = configurations;
     
-    URL dtdURL = PluginConfigurationImporter.class.getResource("/net/sf/basedb/core/dtd/"+dtdFileName);
-    
     JarFile jar = new JarFile(jarPath);
     InputStream is = jar.getInputStream(new JarEntry(xmlPath));
-    Document doc = XMLUtil.getValidatedXML(is, dtdURL, null);
-    is.close();
-    Element rootElement = doc.getRootElement();
-    List children = rootElement.getChildren();    
-    
-    if (children.size() != configurations.size())
-    {
-      throw new BaseException("The list of configuration to import or not does'n " +
-          "have the same size as the list of available plugins");
-    }
-    
-    is = jar.getInputStream(new JarEntry(xmlPath));
     doImport(is, null);
     is.close();

trunk/www/admin/plugindefinitions/index.jsp

@@ -238 +238 @@
       {
         HashMap<Integer, Boolean> configurations = new HashMap<Integer, Boolean>();
-        int configurationNumber = 0;
         for (PluginConfigInfo cnfInfo : configInfos)
         {
           Boolean toImport = Values.getBoolean(request.getParameter(info.getClassName() + "." + cnfInfo.getName()));
-          configurations.put(configurationNumber, toImport);
-          configurationNumber++;
+          configurations.put(cnfInfo.getOrderInXml(), toImport);
         }
         try