Changeset 3708

Timestamp:

Sep 5, 2007, 5:48:53 PM (14 years ago)

Author:

Martin Svensson

Message:

References #364 Configuring the installation is allmost done.

Location:

trunk/www/admin/plugindefinitions

Files:

• auto_install.jsp (modified) (3 diffs)
• index.jsp (modified) (2 diffs)

trunk/www/admin/plugindefinitions/auto_install.jsp

@@ -31 +31 @@
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.ItemContext"
+  import="net.sf.basedb.core.ItemNotFoundException"
+  import="net.sf.basedb.core.ItemQuery"
+  import="net.sf.basedb.core.PluginDefinition"
+  import="net.sf.basedb.core.PluginConfiguration"
   import="net.sf.basedb.core.SessionControl"
+  import="net.sf.basedb.core.query.Hql"
+  import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.Expressions"
+  import="net.sf.basedb.util.FileUtil"
   import="net.sf.basedb.util.PluginInfo"
+  import="net.sf.basedb.util.PluginConfigInfo"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.clients.web.Base"
   
+  import="java.util.Collections"
   import="java.util.List"
   import="java.util.ArrayList"
+  import="java.util.Iterator"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -52 +63 @@
 try
 {
-  String title = "Plugin Autoinstaller";
+  String title = "Plugin autoinstaller";
   java.io.File pluginDir = new java.io.File(request.getParameter("plugin_path"));
+  List<PluginInfo> pluginInfos = new ArrayList<PluginInfo>();
+  List<java.io.File> jarFiles = FileUtil.findFiles(pluginDir, null, "jar", true);
   
+  StringBuilder newPlugins = new StringBuilder();
+    
+  for (java.io.File file : jarFiles)
+  {
+    pluginInfos.addAll(PluginInfo.loadFromJar(file));
+  }
   %>
   <base:page type="popup" title="<%=title%>">
@@ -66 +85 @@
       frm.submit();
     }
+    function toggle(grpId)
+    {
+      var grp = document.getElementById('grp.'+grpId);
+      var grpIcon = document.getElementById('grp.'+grpId+'.icon');
+      var cnfId = 1;
+      var cnf = document.getElementById('cnf.'+grpId+'.'+cnfId);
+      if (cnf && cnf.style.display == 'none')
+      {
+        grpIcon.src = getRoot()+'images/joust/minustop.gif';
+      }
+      else
+      {
+        grpIcon.src = getRoot()+'images/joust/plusonly.gif';
+      }
+      while (cnf)
+      {
+        Main.showHide(cnf.id);
+        cnfId++;
+        cnf = document.getElementById('cnf.'+grpId+'.'+cnfId);
+      }
+    }
+    function setConfigsOnChange(pluginId, selectList)
+    {
+      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 == 'import')
+            {
+              cnf.selectedIndex = i;
+              i = cnf.length;                         
+            }
+          }
+          cnfId++;
+          cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
+        }
+      }
+      else
+      {
+        var cnfId = 1;
+        var cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
+        while (cnf)
+        {
+          for (var i = 0; i < cnf.length; i++)
+          {
+            
+            if (cnf[i].value == 'none')
+            {
+              cnf.selectedIndex = i;
+              i = cnf.length;                         
+            }
+          }
+          cnfId++;
+          cnf = document.getElementById('setconfig.'+pluginId+'.'+cnfId);
+        }
+      }
+    }   
     </script>
   </base:head>
   <base:body>
-    <form name="autoinstall" action="index.jsp" method="get" onsubmit="return false;">
+    <form name="autoinstall" action="index.jsp" method="post" onsubmit="return false;">
     <input type="hidden" name="ID" value="<%=ID%>">
     <input type="hidden" name="cmd" value="LoadPlugins">
+    
+    <h3 class="docked"><%=title%> <base:help tabcontrol="plugins" /></h3>
+    
+    <t:tabcontrol id="plugins" contentstyle="<%="height: "+(int)(scale*260)+"px;"%>" 
+      position="bottom">
+      <t:tab id="plugins" title="Available plugins" validate="validatePlugins()" helpid="plugindefinition.autoinstaller.plugins">
+        <div align="left">
+          <table border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td><b>Plugins</b></td>             
+              <td><b>Install</b></td>
+            </tr>
+            <%
+            int plugin = 0;
+            for (PluginInfo info : pluginInfos)
+            {
+              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 = true;
+              PluginDefinition pd = null;
+              try
+              {
+                pd = PluginDefinition.getByClassName(dc, info.getClassName());
+                if (pd.getJarPath().equals(info.getJarPath()))
+                {
+                  jarExists = true;
+                }
+              }
+              catch(ItemNotFoundException ex)
+              {
+                classExists = false;
+                jarExists = false;
+              }
+              %>
+              <tr id="plugin.<%=plugin%>">
+                <td style="padding-top: 6px;">
+                  <%
+                  if (hasConfigs)
+                  {
+                  %>
+                    <a href="javascript:toggle(<%=plugin%>)" title="Expand/collaps to see/hide configurations">
+                    <base:icon id="<%="grp."+plugin+".icon"%>" image="joust/plusonly.gif" />                    
+                    <%
+                  }
+                  %>                  
+                  &nbsp;<%=HTML.encodeTags(name)%></a>&nbsp;&nbsp;
+                </td>
+                <td>
+                  <select name="setplugin.<%=plugin%>" 
+                   onchange="setConfigsOnChange(<%=plugin%>,this)" <%=classExists&&jarExists ? "disabled" : "" %>>
+                    <option value="none" title="Plugin will not be installed">--None--
+                    <option value="plugin" title="Plugin will be installed">Only plugin
+                    <%
+                    if (hasConfigs)
+                    {
+                    %>
+                      <option value="plugin+confs" title="Plugin and configurations will be installed">With configurations
+                    <%
+                    }
+                    %>
+                  </select>
+                  <base:icon image="<%=classExists&&!jarExists ? "itemexists.gif" : "" %>" />
+                  <base:icon image="<%=classExists&&jarExists ? "hasvalues.gif" : "" %>" />
+                </td>
+              </tr>
+              <%
+              if (hasConfigs)
+              {
+                Iterator<PluginConfigInfo> cnfi = cnfInfos.iterator();
+                while (cnfi.hasNext())
+                {
+                  PluginConfigInfo cnfInfo = cnfi.next();
+                  boolean isDublicate = false;
+                  if (classExists)
+                  {
+                    ItemQuery<PluginConfiguration> cnfQuery = pd.getPluginConfigurations();
+                    cnfQuery.restrict(Restrictions.eq(Hql.property("name"), Expressions.string(cnfInfo.getName())));
+                    Iterator<PluginConfiguration> it = cnfQuery.iterate(dc);
+                    isDublicate = 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;&nbsp;
+                    </td>
+                    <td>
+                      <select id="setconfig.<%=plugin%>.<%=cnf%>">
+                        <option value="none" title="Configuration will not be imported">--None--  
+                        <option value="import" title="Configuration will be imported">Import
+                      </select>
+                      <base:icon image="<%=isDublicate ? "warning.gif" : ""%>" />
+                    </td>
+                  </tr>
+                  <%
+                }
+              }
+            }
+            %>
+          </table>
+        </div>
+        <div align=left style="padding-top:20px">         
+          &nbsp;<i><base:icon image="itemexists.gif" /> = Class with same name exists in another jar-file</i><br>
+          &nbsp;<i><base:icon image="warning.gif" /> = Configuration already exists</i><br>
+          &nbsp;<i><base:icon image="hasvalues.gif" /> = Plugin allready installed, <br>&nbsp;&nbsp;
+          &nbsp;&nbsp;class-name and jar-file are the same as an installed plugin</i>
+        </div>        
+      </t:tab>
+    
+    </t:tabcontrol>
     
     <table align="center">

trunk/www/admin/plugindefinitions/index.jsp

@@ -28 +28 @@
 --%>
 <%@ page session="false"
+  import="net.sf.basedb.core.Application"
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
@@ -129 +130 @@
     ItemContext cc = Base.getAndSetCurrentContext(sc, itemType, pageContext, defaultContext);
     cc.setId(0);
-    redirect = editPage;
+    if (Application.getNonCorePluginDirectory() == null)
+    {
+      redirect = editPage;
+    }
+    else
+    {
+      String pluginPath = Application.getNonCorePluginDirectory().getPath();
+      redirect = "select_installation_type.jsp?ID="+ID+"&plugin_path="+pluginPath;
+    }
+  }
+  else if("InstallationType".equals(cmd))
+  {
+    //Either manually or auto installation is selected
+    if (request.getParameter("installationtypes").equals("autoinstall"))
+    {
+      String pluginPath = request.getParameter("plugin_path");
+      redirect = "auto_install.jsp?ID="+ID+"&plugin_path="+pluginPath;
+    }
+    else if (request.getParameter("installationtypes").equals("manuellinstall"))
+    {
+      redirect = editPage;
+    }
+    
+  }
+  else if("LoadPlugins".equals(cmd))
+  {
+    //Loads plugins from jars that have been selected in auto_installer.jsp
+    dc = sc.newDbControl();
   }
   else if ("UpdateItem".equals(cmd))