scijava-common is its own replacement for SezPoz now

dscho · dscho · commit ce5af00211f4 · 2014-01-14T10:39:52.000-06:00
Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 SciJava Common is a common library for SciJava software. It provides a
-plugin framework, with an extensible mechanism for service discovery, driven
-by the [SezPoz](https://github.com/jglick/sezpoz) library, so that plugins can
-be loaded dynamically. It is used by both
-[ImageJ](https://github.com/imagej/imagej) and
+plugin framework, with an extensible mechanism for service discovery, backed
+by its own annotation processor, so that plugins can be loaded dynamically.
+It is used by both [ImageJ](https://github.com/imagej/imagej) and
 [SCIFIO](https://github.com/scifio/scifio).
 
 This project also contains configuration files and scripts common to the
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 	<version>2.8.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
-	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, driven by the SezPoz library, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
+	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
 
 	<dependencies>
 		<dependency>
diff --git a/src/main/java/org/scijava/annotations/AnnotationCombiner.java b/src/main/java/org/scijava/annotations/AnnotationCombiner.java
@@ -50,7 +50,7 @@
 import org.scijava.util.FileUtils;
 
 /**
- * Combines SezPoz annotations from all JAR files on the classpath.
+ * Combines annotation indexes from all JAR files on the classpath.
  * 
  * @author Curtis Rueden
  */
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginFinder.java b/src/main/java/org/scijava/plugin/DefaultPluginFinder.java
@@ -44,15 +44,15 @@
 /**
  * Default SciJava plugin discovery mechanism.
  * <p>
- * It works by using SezPoz to scan the classpath for {@link Plugin}
- * annotations.
+ * It works by scanning the classpath for {@link Plugin} annotations
+ * previously indexed by scijava-common itself.
  * </p>
  * 
  * @author Curtis Rueden
  */
 public class DefaultPluginFinder implements PluginFinder {
 
-	/** Class loader to use when querying SezPoz. */
+	/** Class loader to use when querying the annotation indexes. */
 	private final ClassLoader customClassLoader;
 
 	// -- Constructors --
@@ -74,13 +74,13 @@ public HashMap<String, Throwable> findPlugins(
 		final HashMap<String, Throwable> exceptions =
 			new HashMap<String, Throwable>();
 
-		// load the SezPoz index
+		// load the annotation indexes
 		final ClassLoader classLoader = getClassLoader();
-		final Index<Plugin> sezPozIndex =
+		final Index<Plugin> annotationIndex =
 			Index.load(Plugin.class, classLoader);
 
 		// create a PluginInfo object for each item in the index
-		for (final IndexItem<Plugin> item : sezPozIndex) {
+		for (final IndexItem<Plugin> item : annotationIndex) {
 			try {
 				final PluginInfo<?> info = createInfo(item, classLoader);
 				plugins.add(info);
diff --git a/src/main/java/org/scijava/plugin/DefaultPluginService.java b/src/main/java/org/scijava/plugin/DefaultPluginService.java
@@ -53,8 +53,8 @@
 /**
  * Default service for keeping track of available plugins.
  * <p>
- * Available plugins are discovered using a library called <a
- * href="http://sezpoz.java.net/">SezPoz</a>. Loading of the actual plugin
+ * Available plugins are discovered using indexes generated by using
+ * scijava-common as annotation processor. Loading of the actual plugin
  * classes can be deferred until a particular plugin is actually needed.
  * </p>
  * <p>
diff --git a/src/main/java/org/scijava/plugin/SciJavaPlugin.java b/src/main/java/org/scijava/plugin/SciJavaPlugin.java
@@ -48,5 +48,5 @@
  * @see PluginService
  */
 public interface SciJavaPlugin {
-	// top-level marker interface for discovery via SezPoz
+	// top-level marker interface for discovery via annotation indexes
 }
diff --git a/src/test/java/org/scijava/annotations/Simple.java b/src/test/java/org/scijava/annotations/Simple.java
@@ -41,7 +41,7 @@
 import java.lang.annotation.Target;
 
 /**
- * A simple annotation for use with SezPoz.
+ * A simple annotation for use with our annotation processor.
  * 
  * @author Johannes Schindelin
  */

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`import org.scijava.util.FileUtils;`
`51`	`51`
`52`	`52`	`/**`
`53`		`- * Combines SezPoz annotations from all JAR files on the classpath.`
	`53`	`+ * Combines annotation indexes from all JAR files on the classpath.`
`54`	`54`	`*`
`55`	`55`	`* @author Curtis Rueden`
`56`	`56`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,5 @@`
`48`	`48`	`* @see PluginService`
`49`	`49`	`*/`
`50`	`50`	`public interface SciJavaPlugin {`
`51`		`- // top-level marker interface for discovery via SezPoz`
	`51`	`+ // top-level marker interface for discovery via annotation indexes`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`import java.lang.annotation.Target;`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * A simple annotation for use with SezPoz.`
	`44`	`+ * A simple annotation for use with our annotation processor.`
`45`	`45`	`*`
`46`	`46`	`* @author Johannes Schindelin`
`47`	`47`	`*/`