github
/
pf4j
mirror of https://github.com/pf4j/pf4j.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

minor changes

pull/3/head
Decebal Suiu 12 years ago
parent
7ac8689a0b
commit
3f6825d077
5 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      pf4j/src/main/java/ro/fortsoft/pf4j/DefaultExtensionFinder.java
  2. 38
      pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
  3. 6
      pf4j/src/main/java/ro/fortsoft/pf4j/DependencyResolver.java
  4. 14
      pf4j/src/main/java/ro/fortsoft/pf4j/PluginLoader.java
  5. 6
      pf4j/src/main/java/ro/fortsoft/pf4j/util/Unzip.java

10
pf4j/src/main/java/ro/fortsoft/pf4j/DefaultExtensionFinder.java
Unescape View File

@ -30,7 +30,7 @@ import net.java.sezpoz.IndexItem;
*/ */
public class DefaultExtensionFinder implements ExtensionFinder { public class DefaultExtensionFinder implements ExtensionFinder {
private static final Logger LOG = LoggerFactory.getLogger(DefaultExtensionFinder.class); private static final Logger log = LoggerFactory.getLogger(DefaultExtensionFinder.class);
private volatile List<IndexItem<Extension, Object>> indices; private volatile List<IndexItem<Extension, Object>> indices;
private ClassLoader classLoader; private ClassLoader classLoader;
@ -41,7 +41,7 @@ public class DefaultExtensionFinder implements ExtensionFinder {
@Override @Override
public <T> List<ExtensionWrapper<T>> find(Class<T> type) { public <T> List<ExtensionWrapper<T>> find(Class<T> type) {
LOG.debug("Find extensions for " + type); log.debug("Find extensions for " + type);
List<ExtensionWrapper<T>> result = new ArrayList<ExtensionWrapper<T>>(); List<ExtensionWrapper<T>> result = new ArrayList<ExtensionWrapper<T>>();
getIndices(); getIndices();
// System.out.println("indices = "+ indices); // System.out.println("indices = "+ indices);
@ -49,16 +49,16 @@ public class DefaultExtensionFinder implements ExtensionFinder {
try { try {
AnnotatedElement element = item.element(); AnnotatedElement element = item.element();
Class<?> extensionType = (Class<?>) element; Class<?> extensionType = (Class<?>) element;
LOG.debug("Checking extension type " + extensionType); log.debug("Checking extension type " + extensionType);
if (type.isAssignableFrom(extensionType)) { if (type.isAssignableFrom(extensionType)) {
Object instance = item.instance(); Object instance = item.instance();
if (instance != null) { if (instance != null) {
LOG.debug("Added extension " + extensionType); log.debug("Added extension " + extensionType);
result.add(new ExtensionWrapper<T>(type.cast(instance), item.annotation().ordinal())); result.add(new ExtensionWrapper<T>(type.cast(instance), item.annotation().ordinal()));
} }
} }
} catch (InstantiationException e) { } catch (InstantiationException e) {
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }

38
pf4j/src/main/java/ro/fortsoft/pf4j/DefaultPluginManager.java
Unescape View File

@ -36,7 +36,7 @@ import ro.fortsoft.pf4j.util.ZipFilter;
*/ */
public class DefaultPluginManager implements PluginManager { public class DefaultPluginManager implements PluginManager {
private static final Logger LOG = LoggerFactory.getLogger(DefaultPluginManager.class); private static final Logger log = LoggerFactory.getLogger(DefaultPluginManager.class);
/** /**
* The plugins repository. * The plugins repository.
@ -160,12 +160,12 @@ public class DefaultPluginManager implements PluginManager {
public void startPlugins() { public void startPlugins() {
for (PluginWrapper pluginWrapper : resolvedPlugins) { for (PluginWrapper pluginWrapper : resolvedPlugins) {
try { try {
LOG.info("Start plugin '" + pluginWrapper.getDescriptor().getPluginId() + "'"); log.info("Start plugin '" + pluginWrapper.getDescriptor().getPluginId() + "'");
pluginWrapper.getPlugin().start(); pluginWrapper.getPlugin().start();
pluginWrapper.setPluginState(PluginState.STARTED); pluginWrapper.setPluginState(PluginState.STARTED);
startedPlugins.add(pluginWrapper); startedPlugins.add(pluginWrapper);
} catch (PluginException e) { } catch (PluginException e) {
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
} }
@ -179,11 +179,11 @@ public class DefaultPluginManager implements PluginManager {
Collections.reverse(startedPlugins); Collections.reverse(startedPlugins);
for (PluginWrapper pluginWrapper : startedPlugins) { for (PluginWrapper pluginWrapper : startedPlugins) {
try { try {
LOG.info("Stop plugin '" + pluginWrapper.getDescriptor().getPluginId() + "'"); log.info("Stop plugin '" + pluginWrapper.getDescriptor().getPluginId() + "'");
pluginWrapper.getPlugin().stop(); pluginWrapper.getPlugin().stop();
pluginWrapper.setPluginState(PluginState.STOPPED); pluginWrapper.setPluginState(PluginState.STOPPED);
} catch (PluginException e) { } catch (PluginException e) {
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
} }
@ -195,7 +195,7 @@ public class DefaultPluginManager implements PluginManager {
public void loadPlugins() { public void loadPlugins() {
// check for plugins directory // check for plugins directory
if (!pluginsDirectory.exists() || !pluginsDirectory.isDirectory()) { if (!pluginsDirectory.exists() || !pluginsDirectory.isDirectory()) {
LOG.error("No '" + pluginsDirectory + "' directory"); log.error("No '" + pluginsDirectory + "' directory");
return; return;
} }
@ -206,7 +206,7 @@ public class DefaultPluginManager implements PluginManager {
try { try {
expandPluginArchive(zipFile); expandPluginArchive(zipFile);
} catch (IOException e) { } catch (IOException e) {
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
@ -217,13 +217,13 @@ public class DefaultPluginManager implements PluginManager {
try { try {
loadPlugin(directory); loadPlugin(directory);
} catch (PluginException e) { } catch (PluginException e) {
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
// check for no plugins // check for no plugins
if (directories.length == 0) { if (directories.length == 0) {
LOG.info("No plugins"); log.info("No plugins");
return; return;
} }
@ -231,7 +231,7 @@ public class DefaultPluginManager implements PluginManager {
try { try {
resolvePlugins(); resolvePlugins();
} catch (PluginException e) { } catch (PluginException e) {
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
} }
} }
@ -289,22 +289,22 @@ public class DefaultPluginManager implements PluginManager {
} }
// retrieves the plugin descriptor // retrieves the plugin descriptor
LOG.debug("Find plugin descriptor '" + pluginPath + "'"); log.debug("Find plugin descriptor '" + pluginPath + "'");
PluginDescriptor pluginDescriptor = pluginDescriptorFinder.find(pluginDirectory); PluginDescriptor pluginDescriptor = pluginDescriptorFinder.find(pluginDirectory);
LOG.debug("Descriptor " + pluginDescriptor); log.debug("Descriptor " + pluginDescriptor);
String pluginClassName = pluginDescriptor.getPluginClass(); String pluginClassName = pluginDescriptor.getPluginClass();
LOG.debug("Class '" + pluginClassName + "'" + " for plugin '" + pluginPath + "'"); log.debug("Class '" + pluginClassName + "'" + " for plugin '" + pluginPath + "'");
// load plugin // load plugin
LOG.debug("Loading plugin '" + pluginPath + "'"); log.debug("Loading plugin '" + pluginPath + "'");
PluginLoader pluginLoader = new PluginLoader(this, pluginDescriptor, pluginDirectory); PluginLoader pluginLoader = new PluginLoader(this, pluginDescriptor, pluginDirectory);
pluginLoader.load(); pluginLoader.load();
LOG.debug("Loaded plugin '" + pluginPath + "'"); log.debug("Loaded plugin '" + pluginPath + "'");
// create the plugin wrapper // create the plugin wrapper
LOG.debug("Creating wrapper for plugin '" + pluginPath + "'"); log.debug("Creating wrapper for plugin '" + pluginPath + "'");
PluginWrapper pluginWrapper = new PluginWrapper(pluginDescriptor, pluginPath, pluginLoader.getPluginClassLoader()); PluginWrapper pluginWrapper = new PluginWrapper(pluginDescriptor, pluginPath, pluginLoader.getPluginClassLoader());
LOG.debug("Created wrapper '" + pluginWrapper + "' for plugin '" + pluginPath + "'"); log.debug("Created wrapper '" + pluginWrapper + "' for plugin '" + pluginPath + "'");
String pluginId = pluginDescriptor.getPluginId(); String pluginId = pluginDescriptor.getPluginId();
@ -324,7 +324,7 @@ public class DefaultPluginManager implements PluginManager {
File pluginDirectory = new File(pluginsDirectory, pluginName); File pluginDirectory = new File(pluginsDirectory, pluginName);
// check if exists directory or the '.zip' file is "newer" than directory // check if exists directory or the '.zip' file is "newer" than directory
if (!pluginDirectory.exists() || (pluginArchiveDate > pluginDirectory.lastModified())) { if (!pluginDirectory.exists() || (pluginArchiveDate > pluginDirectory.lastModified())) {
LOG.debug("Expand plugin archive '" + pluginArchiveFile + "' in '" + pluginDirectory + "'"); log.debug("Expand plugin archive '" + pluginArchiveFile + "' in '" + pluginDirectory + "'");
// create directorie for plugin // create directorie for plugin
pluginDirectory.mkdirs(); pluginDirectory.mkdirs();
@ -346,7 +346,7 @@ public class DefaultPluginManager implements PluginManager {
for (PluginWrapper pluginWrapper : resolvedPlugins) { for (PluginWrapper pluginWrapper : resolvedPlugins) {
unresolvedPlugins.remove(pluginWrapper); unresolvedPlugins.remove(pluginWrapper);
compoundClassLoader.addLoader(pluginWrapper.getPluginClassLoader()); compoundClassLoader.addLoader(pluginWrapper.getPluginClassLoader());
LOG.info("Plugin '" + pluginWrapper.getDescriptor().getPluginId() + "' resolved"); log.info("Plugin '" + pluginWrapper.getDescriptor().getPluginId() + "' resolved");
} }
} }

6
pf4j/src/main/java/ro/fortsoft/pf4j/DependencyResolver.java
Unescape View File

@ -25,7 +25,7 @@ import ro.fortsoft.pf4j.util.DirectedGraph;
*/ */
class DependencyResolver { class DependencyResolver {
private static final Logger LOG = LoggerFactory.getLogger(DependencyResolver.class); private static final Logger log = LoggerFactory.getLogger(DependencyResolver.class);
private List<PluginWrapper> plugins; private List<PluginWrapper> plugins;
@ -51,14 +51,14 @@ class DependencyResolver {
} }
} }
LOG.debug("Graph: " + graph); log.debug("Graph: " + graph);
List<String> pluginsId = graph.reverseTopologicalSort(); List<String> pluginsId = graph.reverseTopologicalSort();
if (pluginsId == null) { if (pluginsId == null) {
throw new CyclicDependencyException("Cyclic dependences !!!" + graph.toString()); throw new CyclicDependencyException("Cyclic dependences !!!" + graph.toString());
} }
LOG.debug("Plugins order: " + pluginsId); log.debug("Plugins order: " + pluginsId);
List<PluginWrapper> sortedPlugins = new ArrayList<PluginWrapper>(); List<PluginWrapper> sortedPlugins = new ArrayList<PluginWrapper>();
for (String pluginId : pluginsId) { for (String pluginId : pluginsId) {
sortedPlugins.add(getPlugin(pluginId)); sortedPlugins.add(getPlugin(pluginId));

14
pf4j/src/main/java/ro/fortsoft/pf4j/PluginLoader.java
Unescape View File

@ -33,7 +33,7 @@ import ro.fortsoft.pf4j.util.JarFilter;
*/ */
class PluginLoader { class PluginLoader {
private static final Logger LOG = LoggerFactory.getLogger(PluginLoader.class); private static final Logger log = LoggerFactory.getLogger(PluginLoader.class);
/* /*
* The plugin repository. * The plugin repository.
@ -58,7 +58,7 @@ class PluginLoader {
libDirectory = new File(pluginRepository, "lib"); libDirectory = new File(pluginRepository, "lib");
ClassLoader parent = getClass().getClassLoader(); ClassLoader parent = getClass().getClassLoader();
pluginClassLoader = new PluginClassLoader(pluginManager, pluginDescriptor, parent); pluginClassLoader = new PluginClassLoader(pluginManager, pluginDescriptor, parent);
LOG.debug("Created class loader " + pluginClassLoader); log.debug("Created class loader " + pluginClassLoader);
} }
public File getPluginRepository() { public File getPluginRepository() {
@ -100,14 +100,14 @@ class PluginLoader {
classesDirectory = classesDirectory.getAbsoluteFile(); classesDirectory = classesDirectory.getAbsoluteFile();
if (classesDirectory.exists() && classesDirectory.isDirectory()) { if (classesDirectory.exists() && classesDirectory.isDirectory()) {
LOG.debug("Found '" + classesDirectory.getPath() + "' directory"); log.debug("Found '" + classesDirectory.getPath() + "' directory");
try { try {
pluginClassLoader.addURL(classesDirectory.toURI().toURL()); pluginClassLoader.addURL(classesDirectory.toURI().toURL());
LOG.debug("Added '" + classesDirectory + "' to the class loader path"); log.debug("Added '" + classesDirectory + "' to the class loader path");
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
return false; return false;
} }
} }
@ -128,10 +128,10 @@ class PluginLoader {
File jarFile = new File(libDirectory, jar); File jarFile = new File(libDirectory, jar);
try { try {
pluginClassLoader.addURL(jarFile.toURI().toURL()); pluginClassLoader.addURL(jarFile.toURI().toURL());
LOG.debug("Added '" + jarFile + "' to the class loader path"); log.debug("Added '" + jarFile + "' to the class loader path");
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
e.printStackTrace(); e.printStackTrace();
LOG.error(e.getMessage(), e); log.error(e.getMessage(), e);
return false; return false;
} }
} }

6
pf4j/src/main/java/ro/fortsoft/pf4j/util/Unzip.java
Unescape View File

@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
*/ */
public class Unzip { public class Unzip {
private static final Logger LOG = LoggerFactory.getLogger(Unzip.class); private static final Logger log = LoggerFactory.getLogger(Unzip.class);
/** /**
* Holds the destination directory. * Holds the destination directory.
@ -61,7 +61,7 @@ public class Unzip {
} }
public void extract() throws IOException { public void extract() throws IOException {
LOG.debug("Extract content of " + source + " to " + destination); log.debug("Extract content of " + source + " to " + destination);
// delete destination file if exists // delete destination file if exists
removeDirectory(destination); removeDirectory(destination);
@ -91,7 +91,7 @@ public class Unzip {
fos.close(); fos.close();
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
LOG.error("File '" + zipEntry.getName() + "' not found"); log.error("File '" + zipEntry.getName() + "' not found");
} }
} }

Write Preview
Loading…
Cancel
Save