Changeset 3819

Timestamp:

Oct 12, 2007, 11:30:01 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Merged log:trunk#3795:3815 into filedb branch

Location:

branches/filedb/src

Files:

• core/net/sf/basedb/util/PluginInfo.java (modified) (1 diff)
• test/TestExternalPluginInstaller.java (modified) (2 diffs)

branches/filedb/src/core/net/sf/basedb/util/PluginInfo.java

@@ -134 +134 @@
           
       //Get the info in base-plugins.xml file.
-      //An exception is thrown if the jar file's name is not the same as the xml-file suggest.
+      //Nothing is done if the xml-file is missing.
       is = jar.getInputStream(new JarEntry(xmlFile));
-      URL installDtdURL = PluginInfo.class.getResource("/net/sf/basedb/core/dtd/" + dtdFile);
-      Element rootElement = XMLUtil.getValidatedXML(is , installDtdURL, null).getRootElement();
-      String jarname = rootElement.getAttributeValue("jarname");
-      ClassLoader jarLoader = JarClassLoader.newInstance(jarFile.getPath());
-      if (!jarname.equalsIgnoreCase(jarFile.getName()))
+      if (is != null)
       {
-        throw new InvalidDataException("Did not find the expected jar file: found '" + 
-            jarFile.getName() + "' but expected: '" + jarname + "'");
+        URL installDtdURL = PluginInfo.class.getResource("/net/sf/basedb/core/dtd/" + dtdFile);
+        Element rootElement = XMLUtil.getValidatedXML(is , installDtdURL, null).getRootElement();
+        String jarname = rootElement.getAttributeValue("jarname");
+        ClassLoader jarLoader = JarClassLoader.newInstance(jarFile.getPath());
+        if (!jarname.equalsIgnoreCase(jarFile.getName()))
+        {
+          throw new InvalidDataException("Did not find the expected jar file: found '" + 
+              jarFile.getName() + "' but expected: '" + jarname + "'");
+        }
+        
+        //Loop through each classelement in the xml file and create a PluginInfo-object
+        //if the class implements Plugin-interface.
+        List<Element> classElements = (List<Element>)rootElement.getChildren();
+        for (Element classElement : classElements)
+        {     
+          String classname = classElement.getAttributeValue("classname");
+          String baseVersion = classElement.getChildText("minbaseversion");
+          String configElement = classElement.getChildText("hasconfigurations");
+          boolean hasConfigs = (configElement != null) && configElement.equals(hasConfigsValue);
+                  
+          Class c = jarLoader.loadClass(classname);       
+          if (versionCompatible(baseVersion) && Plugin.class.isAssignableFrom(c))
+          {     
+            Plugin pl = (Plugin)c.newInstance();
+            About about = pl.getAbout();
+            List<PluginConfigInfo> configs = null;
+            
+            //Get info about configurations if there are any.
+            if (hasConfigs)
+            {
+              InputStream confStream = null;
+              try
+              {
+                confStream = jar.getInputStream(new JarEntry("META-INF/" + configXMLFile));
+                if (confStream != null)
+                {
+                  URL configDtdURL = PluginInfo.class.getResource("/net/sf/basedb/core/dtd/" + configDtdFile);
+                  Document configurationDoc = XMLUtil.getValidatedXML(confStream, configDtdURL, null);
+                  configs = PluginConfigInfo.loadConfigurationsForPlugin(configurationDoc, classname);
+                }
+              }
+              catch (IOException ex)
+              {}
+              finally
+              {
+                if (confStream != null) confStream.close();
+              }
+            }         
+            pluginInfos.add(new PluginInfo(jarFile.getPath(), classname, baseVersion, about, configs));         
+          }       
+        }
       }
-      
-      //Loop through each classelement in the xml file and create a PluginInfo-object
-      //if the class implements Plugin-interface.
-      List<Element> classElements = (List<Element>)rootElement.getChildren();
-      for (Element classElement : classElements)
-      {     
-        String classname = classElement.getAttributeValue("classname");
-        String baseVersion = classElement.getChildText("minbaseversion");
-        String configElement = classElement.getChildText("hasconfigurations");
-        boolean hasConfigs = (configElement != null) && configElement.equals(hasConfigsValue);
-                
-        Class c = jarLoader.loadClass(classname);       
-        if (versionCompatible(baseVersion) && Plugin.class.isAssignableFrom(c))
-        {     
-          Plugin pl = (Plugin)c.newInstance();
-          About about = pl.getAbout();
-          List<PluginConfigInfo> configs = null;
-          
-          //Get info about configurations if there are any.
-          if (hasConfigs)
-          {
-            InputStream confStream = null;
-            try
-            {
-              confStream = jar.getInputStream(new JarEntry("META-INF/" + configXMLFile));
-              URL configDtdURL = PluginInfo.class.getResource("/net/sf/basedb/core/dtd/" + configDtdFile);
-              Document configurationDoc = XMLUtil.getValidatedXML(confStream, configDtdURL, null);
-              configs = PluginConfigInfo.loadConfigurationsForPlugin(configurationDoc, classname);
-            }
-            catch (IOException ex)
-            {}
-            finally
-            {
-              if (confStream != null) confStream.close();
-            }
-          }         
-          pluginInfos.add(new PluginInfo(jarFile.getPath(), classname, baseVersion, about, configs));         
-        }       
-      } 
     }
     catch(Throwable ex)
     {
-      throw new BaseException();
+      throw new BaseException(ex);
     }
     finally

branches/filedb/src/test/TestExternalPluginInstaller.java

@@ -127 +127 @@
         {         
           List<PluginConfigInfo> configurations = info.getConfigurations();
-          write("--Configurations for this plugin that were found: " + configurations.size());
+          if (configurations != null && configurations.size() > 0)
+          {
+            write("--Configurations for this plugin that were found: " + configurations.size());
+          }
+          else
+          {
+            write ("--No configurations were found for this plugin");
+          }
           pluginIds.add(pluginid);
         }
@@ -137 +144 @@
       catch(Throwable th)
       {
+        th.printStackTrace();
         if (pluginid > 0)
         {