mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

fix missing X under substance

Browse Source 
SPARK-1143 -  Add Plugin Dependencies
generic on user search

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@11737 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Michael Will
2010-06-24 14:22:05 +00:00
committed by michael.will
parent 5bacf95a64
commit 1ebb6c17ee
6 changed files with 226 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
src/java/org/jivesoftware/spark/PluginManager.java
View File

@ -19,21 +19,6 @@
*/
package org.jivesoftware.spark;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.jivesoftware.MainWindowListener;
import org.jivesoftware.Spark;
import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.plugin.PluginClassLoader;
import org.jivesoftware.spark.plugin.PublicPlugin;
import org.jivesoftware.spark.util.URLFileSystem;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.settings.JiveInfo;
import javax.swing.SwingUtilities;
import java.awt.EventQueue;
import java.io.File;
import java.io.FileOutputStream;
@ -41,7 +26,6 @@ import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
@ -54,6 +38,22 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.zip.ZipFile;
import javax.swing.SwingUtilities;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.jivesoftware.MainWindowListener;
import org.jivesoftware.Spark;
import org.jivesoftware.spark.plugin.Plugin;
import org.jivesoftware.spark.plugin.PluginClassLoader;
import org.jivesoftware.spark.plugin.PluginDependency;
import org.jivesoftware.spark.plugin.PublicPlugin;
import org.jivesoftware.spark.util.URLFileSystem;
import org.jivesoftware.spark.util.log.Log;
import org.jivesoftware.sparkimpl.settings.JiveInfo;
/**
* This manager is responsible for the loading of all Plugins and Workspaces within Spark environment.
*
@ -241,6 +241,22 @@ public class PluginManager implements MainWindowListener {
Log.error("Unable to load plugin " + name + " due to no minSparkVersion.");
return null;
}
// set dependencies
try {
List dependencies = plugin.selectNodes("depends/plugin");
for (Object depend1 : dependencies) {
Element depend = (Element) depend1;
PluginDependency dependency = new PluginDependency();
dependency.setVersion(depend.selectSingleNode("version").getText());
dependency.setName(depend.selectSingleNode("name").getText());
publicPlugin.addDependency(dependency);
}
}
catch (Exception e) {
e.printStackTrace();
}
// Do operating system check.
boolean operatingSystemOK = isOperatingSystemOK(plugin);
@ -406,6 +422,63 @@ public class PluginManager implements MainWindowListener {
public void initializePlugins() {
try
{
int j = 0;
boolean dependsfound = false;
// Dependency check
for (int i = 0; i< publicPlugins.size(); i++) {
// if dependencies are available, check these
if(((PublicPlugin)publicPlugins.get(i)).getDependency().size()>0) {
List<PluginDependency> dependencies = ((PublicPlugin)publicPlugins.get(i)).getDependency();
// go trough all dependencies
for( PluginDependency dependency : dependencies) {
j = 0;
dependsfound = false;
// look for the specific plugin
for(PublicPlugin plugin1 :publicPlugins) {
if(plugin1.getName()!= null
&& plugin1.getName().equals(dependency.getName())) {
// if the version is compatible then reorder
if(dependency.compareVersion(plugin1.getVersion())){
dependsfound = true;
// when depended Plugin hadn't been installed yet
if(j>i){
// change the order
publicPlugins.add(i, publicPlugins.get(j));
publicPlugins.remove(j+1);
plugins.add(i, plugins.get(j));
plugins.remove(j+1);
// start again, to check the other dependencies
i--;
}
}
// else don't load the plugin and show an error
else {
Log.error("Depended Plugin " + dependency.getName() + " hasn't the right version (" + dependency.getVersion() + "<>" + ((PublicPlugin)publicPlugins.get(i)).getVersion());
}
break;
}
j++;
}
// if the depended Plugin wasn't found, then show error
if(!dependsfound) {
Log.error("Depended Plugin " + dependency.getName() + " is missing for the Plugin " + ((PublicPlugin)publicPlugins.get(i)).getName());
// delete the Plugin, because the depended Plugin is missing
publicPlugins.remove(i);
plugins.remove(i);
i--;
break;
}
}
}
}
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
for (Plugin plugin1 : plugins) {