Changeset 4624

Timestamp:

Nov 4, 2008, 2:56:42 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1155: Automatic plug-in registration wizard should group plug-ins by JAR file

Location:

trunk

Files:

• doc/src/docbook/figures/plugin_autoinstall.png (modified) (previous)
• src/core/net/sf/basedb/util/PluginConfigInfo.java (modified) (2 diffs)
• src/core/net/sf/basedb/util/PluginInfo.java (modified) (3 diffs)
• www/admin/plugindefinitions/auto_install.jsp (modified) (10 diffs)
• www/admin/plugindefinitions/index.jsp (modified) (4 diffs)
• www/images/joust/plugin.png (added)
• www/images/joust/plugindisabled.png (added)
• www/images/joust/pluginwarning.png (added)

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

@@ -27 +27 @@
 import java.util.List;
 import java.util.ListIterator;
+
+import net.sf.basedb.core.DbControl;
+import net.sf.basedb.core.Include;
+import net.sf.basedb.core.ItemQuery;
+import net.sf.basedb.core.PluginConfiguration;
+import net.sf.basedb.core.query.Expressions;
+import net.sf.basedb.core.query.Hql;
+import net.sf.basedb.core.query.Restrictions;
 
 import org.jdom.Document;
@@ -145 +153 @@
     return orderInXml;
   }
+  
+  private boolean exists;
+  
+  /**
+    Check the database if a configuration with the same name is already installed
+    or not. This method should be called before {@link #exists()} is called.
+    @param dc An open DbControl
+    @since 2.9
+  */
+  public void checkInstallation(DbControl dc)
+  {
+    exists = false;
+    ItemQuery<PluginConfiguration> query = PluginConfiguration.getQuery();
+    query.restrict(
+      Restrictions.eq(
+        Hql.property("pluginDefinition.className"), 
+        Expressions.string(getPluginClass())
+      )
+    );
+    query.restrict(
+      Restrictions.eq(
+        Hql.property("name"), 
+        Expressions.string(getName())
+    ));
+    query.include(Include.ALL);
+    exists = query.count(dc) > 0;
+  }
+
+  /**
+    If plug-in configuration with the same name already exists or not. 
+    Before calling this method, {@link #checkInstallation(DbControl)} must be called.
+    @return TRUE if a configuration exists
+    @since 2.9
+  */
+  public boolean exists()
+  {
+    return exists;
+  }
 }

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

@@ -25 +25 @@
 import net.sf.basedb.core.Application;
 import net.sf.basedb.core.BaseException;
+import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.InvalidDataException;
+import net.sf.basedb.core.ItemNotFoundException;
+import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.PermissionDeniedException;
+import net.sf.basedb.core.PluginDefinition;
 import net.sf.basedb.core.plugin.About;
 import net.sf.basedb.core.plugin.Plugin;
@@ -250 +255 @@
   }
   
+  public boolean hasConfigurations()
+  {
+    return configs != null && configs.size() > 0;
+  }
+  
   /**
     The path inside a jar to the xml-file that holds 
@@ -258 +268 @@
   {
     return configurationImportFile;
+  }
+  
+  
+  private boolean denied;
+  private boolean isInstalled;
+  private boolean inSameJarFile;
+  
+  /**
+    Checks the database if this plug-in is installed or not. This method should
+    be called before {@link #isDenied()}, {@link #isInstalled()} or
+    {@link #inSameJarFile()} is called.
+    @param dc An open DbControl
+    @since 2.9
+  */
+  public void checkInstallation(DbControl dc)
+  {
+    denied = false;
+    isInstalled = false;
+    inSameJarFile = false;
+    
+    try
+    {
+      PluginDefinition plugin = PluginDefinition.getByClassName(dc, getClassName());
+      isInstalled = true;
+      inSameJarFile = getJarPath().equals(plugin.getJarPath());
+      denied = plugin.hasPermission(Permission.WRITE);
+    }
+    catch (ItemNotFoundException ex)
+    {}
+    catch (PermissionDeniedException ex)
+    {
+      denied = true;
+    }
+  }
+  
+  /**
+    If the currently logged in user has write permission to the (installed) plug-in
+    or not. Before calling this method, {@link #checkInstallation(DbControl)}
+    must be called.
+    @return TRUE if the user has write permission, FALSE otherwise
+    @since 2.9
+  */
+  public boolean isDenied()
+  {
+    return denied;
+  }
+  
+  /**
+    If the plug-in is already installed in BASE.  Before calling this method, 
+    {@link #checkInstallation(DbControl)} must be called.
+    @return TRUE if the plug-in is installed
+    @since 2.9
+  */
+  public boolean isInstalled()
+  {
+    return isInstalled;
+  }
+  
+  /**
+    If the plug-in is already installed in the same or a different JAR file.
+    Before calling this method, {@link #checkInstallation(DbControl)}
+    must be called.
+    @return TRUE if the plug-in is installed in the same JAR file
+    @since 2.9
+  */
+  public boolean inSameJarFile()
+  {
+    return inSameJarFile;
   }
   

trunk/www/admin/plugindefinitions/auto_install.jsp

@@ -44 +44 @@
   import="net.sf.basedb.util.PluginConfigInfo"
   import="net.sf.basedb.util.Values"
+  import="net.sf.basedb.util.Tree"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.clients.web.Base"
-  
   import="java.util.Collections"
   import="java.util.List"
@@ -56 +56 @@
 <%@ taglib prefix="t" uri="/WEB-INF/tab.tld" %>
 <%!
+
+private Tree<Object> generateTree(DbControl dc, java.io.File pluginDir)
+  throws Exception
+{
+  Tree<Object> tree = new Tree<Object>(null);
+  FileFilter jarFilter = new RegexpFileFilter(".*\\.jar", null);
+  List<java.io.File> jarFiles = FileUtil.findFiles(pluginDir, jarFilter);
+  for (java.io.File file : jarFiles)
+  {
+    addToTree(dc, tree, file);
+  }
+  return tree;
+}
+
+private void addToTree(DbControl dc, Tree<Object> tree, java.io.File file)
+  throws Exception
+{
+  List<PluginInfo> plugins = PluginInfo.loadFromJar(file);
+  if (plugins != null && plugins.size() > 0)
+  {
+    Tree.Entry jarEntry = tree.getRootEntry().addChild(file);
+    for (PluginInfo pluginInfo : plugins)
+    {
+      pluginInfo.checkInstallation(dc);
+      Tree.Entry pluginEntry = jarEntry.addChild(pluginInfo);
+      List<PluginConfigInfo> configs = pluginInfo.getConfigurations();
+      if (configs != null)
+      {
+        for (PluginConfigInfo configInfo : configs)
+        {
+          configInfo.checkInstallation(dc);
+          pluginEntry.addChild(configInfo);
+        }
+      }
+    }
+  }
+}
+String generateJoustTree(Tree<Object> tree)
+{
+  StringBuilder sb = new StringBuilder();
+  Tree.Entry<Object> rootEntry = tree.getRootEntry();
+  Iterator<Tree.Entry<Object>> it = tree.entryIterator();
+  while (it.hasNext())
+  {
+    Tree.Entry<Object> entry = it.next();
+    Tree.Entry<Object> parentEntry = entry.getParent();
+    Object node = entry.getNode();
+    if (node == null) continue;
+    int joustId = System.identityHashCode(entry);
+
+    String name = node.toString();
+    String folderIcon = "";
+    boolean open = false;
+    sb.append("var node").append(joustId).append(" = ");
+    if (parentEntry == rootEntry)
+    {
+      sb.append("JoustMenu.addMenuItem(-1");
+    }
+    else
+    {
+      String parentVar = "node" + System.identityHashCode(parentEntry);
+      sb.append("JoustMenu.addChildItem(").append(parentVar);
+    }
+
+    if (node instanceof java.io.File)
+    {
+      java.io.File file = (java.io.File)node;
+      name = file.getName();
+      folderIcon = "JarFile";
+      int numUpdated = 0;
+      int numInstalled = 0;
+      for (Tree.Entry<Object> children : entry.getChildren())
+      {
+        PluginInfo child = (PluginInfo)children.getNode();
+        if (!child.inSameJarFile()) 
+        {
+          numUpdated++;
+        }
+        else
+        {
+          numInstalled++;
+        }
+      }
+      if (numUpdated > 0)
+      {
+        name += " (" + numUpdated + " new";
+        if (numInstalled > 0) name += "; " + numInstalled + " existing";
+        name += ")";
+        open = true;
+      }
+      else
+      {
+        name += " (already installed)";
+      }
+    }
+    else if (node instanceof PluginInfo)
+    {
+      PluginInfo info = (PluginInfo)node;
+      name = info.getAbout().getName();
+      if (info.inSameJarFile() || info.isDenied())
+      {
+        folderIcon = "PluginDisabled";
+      }
+      else if (info.isInstalled())
+      {
+        folderIcon = "PluginWarning";
+      }
+      else
+      {
+        folderIcon = "Plugin";
+      }
+    }
+    else if (node instanceof PluginConfigInfo)
+    {
+      PluginConfigInfo info = (PluginConfigInfo)node;
+      name = info.getName();
+      if (info.exists())
+      {
+        folderIcon = "ConfigurationWarning";
+      }
+      else
+      {
+        folderIcon = "Configuration";
+      }
+    }
+    
+    sb.append(",'").append(folderIcon).append("'");
+    sb.append(",'").append(HTML.javaScriptEncode(name)).append("'");
+    sb.append(", null, '', '").append(joustId).append("');\n");
+    if (open)
+    {
+      sb.append("JoustMenu.menuItems[node").append(joustId).append("].isOpen = true;\n");
+    }
+  }
+
+  return sb.toString();
+}
+
 private String getInfoMessage(PluginInfo info, int id)
 {
   StringBuilder message = new StringBuilder();
-  message.append("<div id=\"info."+id+"\" class=\"postit\" style=\"width:350px;display:none;\">");
+  message.append("<div id=\"info."+id+"\" class=\"postit\" style=\"width:400px; display:none;\">");
   
   message.append("<b>").append("Jar: ").append("</b>");
@@ -101 +239 @@
   List<PluginInfo> pluginInfos = new LinkedList<PluginInfo>();
   FileFilter jarFilter = new RegexpFileFilter(".*\\.jar", null);
+  
+  Tree<Object> plugins = generateTree(dc, pluginDir);
+  
   List<java.io.File> jarFiles = FileUtil.findFiles(pluginDir, jarFilter);
     
@@ -109 +250 @@
   %>
   <base:page type="popup" title="<%=title%>">
-  <base:head scripts="tabcontrol.js" styles="tabcontrol.css">
+  <base:head scripts="tabcontrol.js,newjoust.js" styles="tabcontrol.css">
     <script language="JavaScript">
     
@@ -118 +259 @@
       frm.submit();
     }
-    function toggle(grpId)
-    {
-      var grp = document.getElementById('grp.'+grpId);
-      var grpIcon = document.getElementById('grp.'+grpId+'.icon');
-      var anchor = document.getElementById('a.'+grpId);
-      var cnfId = 1;
-      var cnf = document.getElementById('cnf.'+grpId+'.'+cnfId);
-      if (cnf && cnf.style.display == 'none')
-      {
-        grpIcon.src = getRoot()+'images/joust/minustop.gif';
-        anchor.title='Collapse to hide configurations';
-      }
-      else
-      {
-        grpIcon.src = getRoot()+'images/joust/plusonly.gif';
-        anchor.title='Expand to see configurations for this plugin';        
-      }
-      while (cnf)
-      {
-        Main.showHide(cnf.id);
-        cnfId++;
-        cnf = document.getElementById('cnf.'+grpId+'.'+cnfId);
-      }
-    }
-    function setConfigsOnChange(pluginId, selectList, pluginExists)
-    {
-      var installoption = selectList[selectList.selectedIndex].value;
-      if (installoption == 'plugin+confs')
-      {
-        var cnfId = 1;
-        var cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
-        while (cnf)
-        {
-          for (var i = 0; i < cnf.length; i++)
-          {
-            
-            if (cnf[i].value == '1')
-            {
-              cnf.selectedIndex = i;
-              i = cnf.length;                         
-            }
-          }
-          cnfId++;
-          cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
-        }
-      }
-      else if (!pluginExists && installoption == '')
-      {
-        var cnfId = 1;
-        var cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
-        while (cnf)
-        {
-          for (var i = 0; i < cnf.length; i++)
-          {
-            
-            if (cnf[i].value == '0')
-            {
-              cnf.selectedIndex = i;
-              i = cnf.length;                         
-            }
-          }
-          cnfId++;
-          cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
-        }
-      }
-    }
-    function setPluginOnChange(pluginId, selectList, pluginExists)
-    {
-      var configOption = selectList[selectList.selectedIndex].value;
-      var pluginList = document.getElementById('setplugin.' + pluginId);
-      var pluginOption = pluginList[pluginList.selectedIndex].value;
-      if ( (configOption == '1' && !pluginExists && pluginOption == '') ||
-        (configOption == '0' && pluginOption == 'plugin+confs') )
-      {
-        for (var i=0; i<pluginList.length;i++)
-        {
-          if (pluginList[i].value == 'plugin')
-          {
-            pluginList.selectedIndex = i;
-            i = pluginList.length;
-          }
-        }
-      }
-    }
+    function installAll(jarFile)
+    {
+      var frm = document.forms['autoinstall'];
+      for (var i = 0; i < frm.elements.length; i++)
+      {
+        var element = frm[i];
+        if (element.name.indexOf(jarFile) == 0 && element.type == 'select-one' && !element.disabled)
+        {
+          element.selectedIndex = element.options.length-1;
+          pluginOnChange(element);
+        }
+      }
+    }
+
+    function pluginOnChange(list)
+    {
+      var selected = list[list.selectedIndex].value;
+      var configOption = selected == 'plugin+confs' ? 1 : 0;
+      var frm = document.forms['autoinstall'];
+      var pluginClass = list.name.substring(list.name.indexOf(':')+1);
+      for (var i = 0; i < frm.elements.length; i++)
+      {
+        var element = frm[i];
+        if (element.name.indexOf(pluginClass+":config") == 0 && element.type == 'select-one' && !element.disabled)
+        {
+          Forms.selectListOption(element, configOption);
+        }
+      }   
+    }
+
+    function configOnChange(list)
+    {
+      var selected = list[list.selectedIndex].value;
+      if (selected == 0) return;
+      var frm = document.forms['autoinstall'];
+      var pluginClass = list.name.substring(0, list.name.indexOf(':'));
+      for (var i = 0; i < frm.elements.length; i++)
+      {
+        var element = frm[i];
+        if (element.name.indexOf(pluginClass) > 0 && element.type == 'select-one' && !element.disabled)
+        {
+          Forms.selectListOption(element, 'plugin+confs');
+        }
+      }   
+      
+    }
+
     function toggleInformation(pluginId)
     {
@@ -214 +318 @@
       }
     }
+    function init()
+    {
+      var iconDir = getRoot()+'images/joust/';
+      IconStore.init(iconDir + 'big/', 18, 22);
+      IconStore.addIcon('JarFile', iconDir + 'jarfile.png', 18, 16);
+      IconStore.addIcon('Plugin', iconDir + 'plugin.png', 18, 16);
+      IconStore.addIcon('PluginDisabled', iconDir + 'plugindisabled.png', 18, 16);
+      IconStore.addIcon('PluginWarning', iconDir + 'pluginwarning.png', 18, 16);
+      IconStore.addIcon('Configuration', iconDir + 'item.gif', 18, 16);
+      IconStore.addIcon('ConfigurationWarning', iconDir + 'itemwarning.gif', 18, 16);
+
+      JoustMenu.toggle = function(menuItemIndex)
+      {
+        var menuItem = this.menuItems[menuItemIndex];
+        if (!menuItem) return;
+        // Switch the open/closed status and hide or show the children
+        menuItem.isOpen = !menuItem.isOpen;
+        if (menuItem.isOpen)
+        {
+          this.showChildren(menuItemIndex);
+        }
+        else
+        {
+          this.hideChildren(menuItemIndex);
+        }
+        this.updateIconsAndText(menuItemIndex);
+      }
+      
+      JoustMenu.drawMenuItems = function(firstIndex, indentString)
+      {
+        var menuItem = this.menuItems[firstIndex];
+        while (menuItem)
+        {
+          var html = menuItem.draw(indentString);
+          var padIcon = IconStore.getIcon(menuItem.noOutlineIcon == true ? null : menuItem.nextItemIndex == -1 ? 'iconBlank' : 'iconLine');
+          var padHtml = padIcon == null ? '' : padIcon.getImgTag();
+          
+          var menuDiv = document.getElementById('tree.'+menuItem.externalId);
+          menuDiv.innerHTML = html;
+          
+          if (menuItem.firstChildIndex != -1)
+          {
+            this.drawMenuItems(menuItem.firstChildIndex, indentString+padHtml);
+          }
+          if (!menuItem.isOpen)
+          {
+            this.hideChildren(menuItem.index);
+          }
+          menuItem = this.menuItems[menuItem.nextItemIndex];
+        }
+        return '';
+      }
+
+      JoustMenu.hideChildren = function(menuItemIndex)
+      {
+        var menuItem = this.menuItems[menuItemIndex];
+        if (menuItem)
+        {
+          var firstChildIndex = menuItem.firstChildIndex;
+          var child = this.menuItems[firstChildIndex];
+          while (child)
+          {
+            var e = document.getElementById('row.'+child.externalId);
+            e.style.display = 'none';
+            this.hideChildren(child.index);
+            child = this.menuItems[child.nextItemIndex];
+          }
+        }
+      }
+      
+      JoustMenu.showChildren = function(menuItemIndex)
+      {
+        var menuItem = this.menuItems[menuItemIndex];
+        if (menuItem)
+        {
+          var firstChildIndex = menuItem.firstChildIndex;
+          var child = this.menuItems[firstChildIndex];
+          while (child)
+          {
+            var e = document.getElementById('row.'+child.externalId);
+            e.style.display = Browser.isIE ? 'block' : 'table-row';
+            if (child.isOpen)
+            {
+              this.showChildren(child.index);
+            }
+            child = this.menuItems[child.nextItemIndex];
+          }
+        }
+      }
+      <%=generateJoustTree(plugins)%>
+      JoustMenu.draw('joust');
+    }
     </script>
   </base:head>
-  <base:body>
+  <base:body onload="init()">
     <form name="autoinstall" action="index.jsp" method="post" onsubmit="return false;">
     <input type="hidden" name="ID" value="<%=ID%>">
@@ -223 +419 @@
     
     <h3 class="docked"><%=title%> <base:help tabcontrol="plugins" /></h3>
-    
-    <t:tabcontrol id="plugins" contentstyle="<%="height: "+(int)(scale*260)+"px;"%>" 
+    <t:tabcontrol id="plugins" contentstyle="<%="height: "+(int)(scale*340)+"px;"%>" 
       position="bottom">
       <t:tab id="plugins" title="Available plugins" validate="validatePlugins()" helpid="plugindefinition.autoinstaller">
@@ -230 +425 @@
           <table border="0" cellspacing="0" cellpadding="0">
             <tr>
-              <td width="45%"><b>Plugins</b></td>             
+              <td width="45%"><b>Plugins</b></td>
               <td><b>Install</b></td>
               <td><b>Trusted</b></td>
@@ -236 +431 @@
             </tr>
             <%
-            int plugin = 0;
-            for (PluginInfo info : pluginInfos)
+            Iterator<Tree.Entry<Object>> ite = plugins.entryIterator();
+            while (ite.hasNext())
             {
-              String name = info.getAbout().getName();
-              List<PluginConfigInfo> cnfInfos = info.getConfigurations();
-              ++plugin;
-              int cnf = 0;
-              boolean hasConfigs = cnfInfos != null && !cnfInfos.isEmpty();
-              boolean classExists = true;
-              boolean jarExists = false;
-              PluginDefinition pd = null;
-              try
+              Tree.Entry<Object> entry = ite.next();
+              Object node = entry.getNode();
+              if (node == null) continue;
+              int joustId = System.identityHashCode(entry);
+              String name = node.toString();
+              PluginInfo pluginInfo = null;
+              PluginConfigInfo configInfo = null;
+              java.io.File jarFile = null;
+              if (node instanceof PluginInfo)
               {
-                pd = PluginDefinition.getByClassName(dc, info.getClassName());
-                if (pd.getJarPath().equals(info.getJarPath()))
+                pluginInfo = (PluginInfo)node;
+                name = pluginInfo.getAbout().getName();
+              }
+              else if (node instanceof PluginConfigInfo)
+              {
+                configInfo = (PluginConfigInfo)node;
+                name = configInfo.getName();
+              }
+              else if (node instanceof java.io.File)
+              {
+                jarFile = (java.io.File)node;
+                name = jarFile.getName();
+              }
+              %>
+              <tr id="row.<%=joustId%>">
+                <td style="white-space: nowrap;"><div id="tree.<%=joustId%>"><%=name %></div></td>
+                <%
+                if (jarFile != null)
                 {
-                  jarExists = true;
-                }
-              }
-              catch(ItemNotFoundException ex)
-              {
-                classExists = false;
-                jarExists = false;
-              }             
-              %>
-              <tr id="plugin.<%=plugin%>">
-                <td style="padding-top: 6px;">                  
-                  <%
-                  if (hasConfigs)
+                  boolean enableInstall = false;
+                  for (Tree.Entry<Object> children : entry.getChildren())
                   {
-                  %>
-                    <a href="javascript:toggle(<%=plugin%>)" id="<%="a."+plugin%>" title="Expand to see configurations for this plugin">
-                    <base:icon id="<%="grp."+plugin+".icon"%>" image="joust/plusonly.gif" />
-                    <a onmouseover="javascript:toggleInformation(<%=plugin%>)" 
-                      onmouseout="javascript:toggleInformation(<%=plugin%>)"
-                    >
-                      <base:icon image="info.gif"/>
-                    </a>                  
-                    <%=getInfoMessage(info, plugin)%>
-                    &nbsp;<%=HTML.encodeTags(name)%></a>&nbsp;&nbsp;                    
-                    <%
+                    PluginInfo child = (PluginInfo)children.getNode();
+                    if (!child.isInstalled()) enableInstall = true; 
                   }
-                  else
+                  if (enableInstall)
                   {
                     %>
-                    <a onmouseover="javascript:toggleInformation(<%=plugin%>)" 
-                      onmouseout="javascript:toggleInformation(<%=plugin%>)"
-                    >
-                      <base:icon image="info.gif"/>
-                    </a>                  
-                    <%=getInfoMessage(info, plugin)%>
-                    &nbsp;<%=HTML.encodeTags(name)%>&nbsp;&nbsp;
-                    <%
+                    <td><a href="javascript:installAll('<%=jarFile.getAbsolutePath()%>')">Install all</a></td>
+                    <% 
                   }
-                  %>                  
-                  
-                </td>
-                <td>
-                  <select id="setplugin.<%=plugin%>" name="<%=info.getJarPath()%>.<%=info.getClassName()%>" 
-                    style="width:90px"
-                    onchange="setConfigsOnChange(<%=plugin%>,this, <%=classExists%>)" 
-                    <%=classExists&&jarExists ? "disabled" : "" %>
-                   >
-                    <option value="" title="Plugin will not be installed">no
-                    <%
-                    if (hasConfigs)
-                    {
+                }
+                if (pluginInfo != null)
+                {
+                  boolean disabled = pluginInfo.isDenied() || pluginInfo.inSameJarFile();
+                  %>
+                  <td>
+                    <input type="hidden" name="<%=pluginInfo.getClassName()%>:isInstalled" value="<%=pluginInfo.isInstalled()%>">
+                    <input type="hidden" name="<%=pluginInfo.getClassName()%>:inSameJarFile" value="<%=pluginInfo.inSameJarFile()%>">
+                    <select  
+                      name="<%=pluginInfo.getJarPath()%>:<%=pluginInfo.getClassName()%>"
+                      onchange="pluginOnChange(this)"
+                      style="width:90px"
+                      <%=disabled ? "disabled" : "" %>
+                      >
+                      <%
+                      if (disabled)
+                      {
+                        %>
+                        <option value="" title="Already installed">installed
+                        <%
+                      }
+                      else
+                      {
+                        %>
+                        <option value="" title="Plugin will not be installed">no
+                        <%
+                      }
+                      if (pluginInfo.hasConfigurations())
+                      {
+                        %>
+                        <option value="plugin" title="Only the plugin will be installed">plugin only
+                        <option value="plugin+confs" 
+                          title="Plugin and all configurations will be installed">plugin + configurations</option>
+                        <%
+                      }
+                      else
+                      {
+                        %>
+                        <option value="plugin" title="Plugin will be installed">yes
+                        <%
+                      }
                       %>
-                      <option value="plugin" title="Only the plugin will be installed">plugin only
-                      <option value="plugin+confs" 
-                        title="Plugin and all configurations will be installed">plugin + configurations</option>
+                    </select>
+                    <a onmouseover="javascript:toggleInformation(<%=joustId%>)" 
+                      onmouseout="javascript:toggleInformation(<%=joustId%>)"
+                      ><base:icon image="info.gif"/></a>
+                      <%=getInfoMessage(pluginInfo, joustId) %>
+                  </td>
+                  <%
+                  if (!disabled)
+                  {
+                    %>
+                    <td>
+                      <select name="<%=pluginInfo.getClassName()%>:trusted" 
+                        <%=disabled ? "disabled" : ""%>
+                      >
+                        <option value="0">no
+                        <option value="1">yes
+                      </select>
+                    </td>
+                  <td>
+                    <select name="<%=pluginInfo.getClassName()%>:immediate_execution" 
+                      <%=disabled ? "disabled" : ""%>
+                      >
+                      <option value="0">deny
+                      <option value="1">allow
                       <%
-                    }
-                    else
-                    {
+                      if (allowImmediateExecution == null)
+                      {
+                        %>
+                        <option value="" selected>auto
+                        <%
+                      }
                       %>
-                      <option value="plugin" title="Plugin will be installed">yes
-                      <%
-                    }
-                    %>
-                  </select>&nbsp;&nbsp;
-                  <input type="hidden" name="<%=info.getClassName()%>.classExists" value="<%=classExists%>">
-                  <input type="hidden" name="<%=info.getClassName()%>.jarExists" value="<%=jarExists%>">
-                  <base:icon image="<%=classExists&&!jarExists ? "itemexists.gif" : "" %>" 
-                    tooltip="The plugin is loaded from a different jar-file"
-                  />
-                  <base:icon image="<%=classExists&&jarExists ? "hasvalues.gif" : "" %>" 
-                    tooltip="Plugin with the same class name is already installed"
-                  />
-                </td>
-                <td>
-                  &nbsp;
-                  <select name="<%=info.getClassName()%>.trusted" 
-                    <%=classExists&&jarExists ? "disabled" : ""%>
-                  >
-                    <option value="0">no
-                    <option value="1">yes
-                  </select>
-                  &nbsp;&nbsp;
-                </td>
-                <td>
-                  &nbsp;
-                  <select name="<%=info.getClassName()%>.immediate_execution" 
-                    <%=classExists&&jarExists ? "disabled" : ""%>
-                  >
-                    <option value="0">deny
-                    <option value="1">allow
-                    <%
-                    if (allowImmediateExecution == null)
-                    {
-                      %>
-                      <option value="" selected>auto
-                      <%
-                    }
-                    %>
-                  </select>
-                </td>
-              </tr>
-              <%
-              if (hasConfigs)
-              {
-                Iterator<PluginConfigInfo> cnfi = cnfInfos.iterator();
-                while (cnfi.hasNext())
-                {
-                  PluginConfigInfo cnfInfo = cnfi.next();
-                  boolean isDuplicate = false;
-                  if (classExists)
-                  {
-                    ItemQuery<PluginConfiguration> cnfQuery = pd.getPluginConfigurations();
-                    cnfQuery.include(Include.ALL);
-                    cnfQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(cnfInfo.getName())));
-                    Iterator<PluginConfiguration> it = cnfQuery.iterate(dc);
-                    isDuplicate = it != null && it.hasNext();
-                  }
-                  ++cnf;
-                  boolean hasNext = cnfi.hasNext();
-                  %>
-                  <tr id="cnf.<%=plugin%>.<%=cnf%>" style="display: none;">
-                    <td>
-                      <base:icon 
-                        image="<%=hasNext ? "joust/big/join.gif" : "joust/big/joinbottom.gif"%>" 
-                      />                      
-                      <%=HTML.encodeTags(cnfInfo.getName())%>&nbsp;
-                    </td>
-                    <td>
-                      <select id="setconfig.<%=plugin%>.<%=cnf%>" name="<%=info.getClassName()%>.<%=cnfInfo.getName()%>"
-                        onChange="setPluginOnChange(<%=plugin%>, this, <%=classExists%>)">
-                        <option value="0" title="Configuration will not be imported">no</option>
-                        <option value="1" title="Configuration will be imported">yes</option>
-                      </select>
-                      <base:icon image="<%=isDuplicate ? "warning.gif" : ""%>" tooltip="Plugin already has a configuration with this name"/>
-                    </td>
-                  </tr>
+                    </select>
+                  </td>
                   <%
                 }
               }
+              else if (configInfo != null)
+              {
+                %>
+                <td>
+                  <select 
+                    onchange="configOnChange(this)"
+                    name="<%=configInfo.getPluginClass()%>:config:<%=configInfo.getName()%>">
+                    <option value="0" title="Configuration will not be imported">no</option>
+                    <option value="1" title="Configuration will be imported">yes</option>
+                  </select>
+                </td>
+                <%
+              }
+              %>
+              </tr>
+              <%
             }
             %>
@@ -397 +575 @@
         </div>
         <div align="right">
-          &nbsp;<i><base:icon image="warning.gif" /> = duplicate configuration</i><br>
-          &nbsp;<i><base:icon image="hasvalues.gif" /> = plugin already installed</i><br>
-          &nbsp;<i><base:icon image="itemexists.gif" /> = exists in a different jar-file,<br> 
-            installing will change the jar path.</i><br>
+          &nbsp;<i><base:icon image="joust/plugindisabled.png" /> = plug-in is already installed</i><br>
+          &nbsp;<i><base:icon image="joust/pluginwarning.png" /> = exists in a different JAR file</i><br>
+          &nbsp;<i><base:icon image="joust/itemwarning.gif" /> = configuration already exists</i><br>
         </div>
       </t:tab>
-    
     </t:tabcontrol>
     

trunk/www/admin/plugindefinitions/index.jsp

@@ -183 +183 @@
     for (PluginInfo info : pluginInfos)
     {
-      String selectedOption = request.getParameter(info.getJarPath() + "." + info.getClassName());
+      String selectedOption = request.getParameter(info.getJarPath() + ":" + info.getClassName());
       if (selectedOption == null) selectedOption = "";      
-      boolean classExists = Values.getBoolean(request.getParameter(info.getClassName()+".classExists"));
-      boolean jarExists = Values.getBoolean(request.getParameter(info.getClassName()+".jarExists"));
-      int usePermissions = Values.getInt(request.getParameter("use_permissions"));
+      boolean isInstalled = Values.getBoolean(request.getParameter(info.getClassName()+":isInstalled"));
+      boolean inSameJarFile = Values.getBoolean(request.getParameter(info.getClassName()+":inSameJarFile"));
       if (selectedOption.equals("plugin") || selectedOption.equals("plugin+confs"))
       {
         //The plugin doesn't exists
-        if (!classExists)
+        if (!isInstalled)
         {
           PluginDefinition pd = null;
           try
           {
-            pd = PluginDefinition.getNew(dc, info.getClassName(), info.getJarPath(), usePermissions==2);
+            pd = PluginDefinition.getNew(dc, info.getClassName(), info.getJarPath(), true);
           }
           catch(BaseException bex)
@@ -206 +205 @@
           {
             dc.saveItem(pd);
-            pd.setTrusted(Values.getBoolean(request.getParameter("trusted")));
-            String aie = Values.getStringOrNull(request.getParameter("immediate_execution"));
+            pd.setTrusted(Values.getBoolean(request.getParameter(info.getClassName()+":trusted")));
+            String aie = Values.getStringOrNull(request.getParameter(info.getClassName()+":immediate_execution"));
             pd.setAllowImmediateExecution(aie == null ? 
               pd.getMainType() == Plugin.MainType.EXPORT : Values.getBoolean(aie));           
@@ -213 +212 @@
         }
         //The plugin exists but in a different jar, this will change the plugin's jarpath
-        else if (classExists && !jarExists)
+        else if (isInstalled && !inSameJarFile)
         {
           try 
           {
             PluginDefinition pd = PluginDefinition.getByClassName(dc, info.getClassName());
-            pd.loadPluginInformation(info.getJarPath(), info.getClassName(), usePermissions == 2);
+            pd.loadPluginInformation(info.getJarPath(), info.getClassName(), true);
           }
           catch(BaseException bex)
@@ -239 +238 @@
         for (PluginConfigInfo cnfInfo : configInfos)
         {
-          Boolean toImport = Values.getBoolean(request.getParameter(info.getClassName() + "." + cnfInfo.getName()));
+          Boolean toImport = Values.getBoolean(request.getParameter(info.getClassName() + ":config:" + cnfInfo.getName()));
           configurations.put(cnfInfo.getOrderInXml(), toImport);
         }