diff -Nru sezpoz-1.9/debian/changelog sezpoz-1.10/debian/changelog
--- sezpoz-1.9/debian/changelog	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/changelog	2015-04-28 07:37:06.000000000 +0000
@@ -1,3 +1,28 @@
+sezpoz (1.10-2) unstable; urgency=medium
+
+  * Team upload.
+  * Upload to unstable
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Tue, 28 Apr 2015 09:36:48 +0200
+
+sezpoz (1.10-1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Fixes the Java 8 compatibility (Closes: #750745)
+    - Removed the Java 7 compatibility patch (fixed upstream)
+    - New build dependency on libanimal-sniffer-java
+  * debian/control:
+    - Standards-Version updated to 3.9.6 (no changes)
+    - Removed the deprecated DM-Upload-Allowed field
+    - Use canonical URLs for the Vcs-* fields
+    - Updated the Homepage field
+  * debian/watch: Watch the release tags on GitHub
+  * debian/copyright: Use the Copyright Format 1.0 URL
+  * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Thu, 02 Apr 2015 17:42:21 +0200
+
 sezpoz (1.9-2) unstable; urgency=low
 
   [James Page]
diff -Nru sezpoz-1.9/debian/compat sezpoz-1.10/debian/compat
--- sezpoz-1.9/debian/compat	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/compat	2015-04-02 14:30:19.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru sezpoz-1.9/debian/control sezpoz-1.10/debian/control
--- sezpoz-1.9/debian/control	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/control	2015-04-02 15:38:26.000000000 +0000
@@ -3,13 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: James Page <james.page@ubuntu.com>
-DM-Upload-Allowed: yes
-Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
-Build-Depends-Indep: default-jdk-doc, junit4, libmaven-javadoc-plugin-java
-Standards-Version: 3.9.2
-Homepage: http://sezpoz.java.net/
-Vcs-Git: git://git.debian.org/git/pkg-java/sezpoz.git
-Vcs-Browser: http://git.debian.org/?p=pkg-java/sezpoz.git
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper
+Build-Depends-Indep: default-jdk-doc, junit4, libmaven-javadoc-plugin-java, libanimal-sniffer-java
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/sezpoz.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sezpoz.git
+Homepage: https://github.com/jglick/sezpoz
 
 Package: libsezpoz-java
 Architecture: all
diff -Nru sezpoz-1.9/debian/copyright sezpoz-1.10/debian/copyright
--- sezpoz-1.9/debian/copyright	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/copyright	2015-04-02 15:29:27.000000000 +0000
@@ -1,7 +1,7 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SezPoz
 Upstream-Contact:  Jesse Glick <jesse.glick@sun.com> as Developer
-Source: https://sezpoz.java.net/
+Source: https://github.com/jglick/sezpoz
 
 Files: *
 Copyright: 2010, Jesse Glick <jesse.glick@oracle.com>,
diff -Nru sezpoz-1.9/debian/libsezpoz-java.poms sezpoz-1.10/debian/libsezpoz-java.poms
--- sezpoz-1.9/debian/libsezpoz-java.poms	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/libsezpoz-java.poms	2015-04-28 07:37:58.000000000 +0000
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,15 +13,19 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
-pom.xml  --no-parent
-sezpoz/pom.xml 
+pom.xml --no-parent
+sezpoz/pom.xml --has-package-version --java-lib
 perftest/pom.xml --ignore
 demo/pom.xml --ignore
diff -Nru sezpoz-1.9/debian/maven.ignoreRules sezpoz-1.10/debian/maven.ignoreRules
--- sezpoz-1.9/debian/maven.ignoreRules	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/maven.ignoreRules	2015-04-28 07:38:40.000000000 +0000
@@ -16,5 +16,6 @@
 
 net.java.sezpoz perftest jar * * *
 net.java.sezpoz.demo pom pom * * *
-org.jvnet.wagon-svn wagon-svn * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
 org.codehaus.mojo versions-maven-plugin * * * *
+org.jvnet.wagon-svn wagon-svn * * * *
diff -Nru sezpoz-1.9/debian/orig-tar.sh sezpoz-1.10/debian/orig-tar.sh
--- sezpoz-1.9/debian/orig-tar.sh	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/orig-tar.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../sezpoz_$VERSION.orig.tar.gz
-DIR=sezpoz-$VERSION
-TAG=$(echo "pom-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-
-svn export https://svn.java.net/svn/sezpoz~svn/tags/${TAG}/ $DIR
-GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
-rm -rf $DIR ../$TAG
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-  . .svn/deb-layout
-  mv $TAR $origDir && echo "moved $TAR to $origDir"
-fi
diff -Nru sezpoz-1.9/debian/patches/build.patch sezpoz-1.10/debian/patches/build.patch
--- sezpoz-1.9/debian/patches/build.patch	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/patches/build.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-Description: Disable performance testing and demo elements
- of build process as not required for packaging and pull extra 
- depends.
-Author: James Page <james.page@canonical.com>
-Forwarded: not-needed
-
-Index: sezpoz/pom.xml
-===================================================================
---- sezpoz.orig/pom.xml	2011-03-17 13:18:17.000000000 +0000
-+++ sezpoz/pom.xml	2011-06-03 13:13:44.102717856 +0100
-@@ -105,7 +105,5 @@
-     </reporting>
-     <modules>
-         <module>sezpoz</module>
--        <!--<module>perftest</module>-->
--        <module>demo</module>
-     </modules>
- </project>
diff -Nru sezpoz-1.9/debian/patches/fix-java7-compat.patch sezpoz-1.10/debian/patches/fix-java7-compat.patch
--- sezpoz-1.9/debian/patches/fix-java7-compat.patch	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/patches/fix-java7-compat.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-Description: Fix compilation error on JDK 7u1.
- (${java.vendor} is now "Oracle Corporation".)
-Author: jglick
-Origin: http://java.net/projects/sezpoz/sources/svn/revision/156
-
---- a/sezpoz/pom.xml (revision 155)
-+++ b/sezpoz/pom.xml (revision 156)
-@@ -14,10 +14,9 @@
-         <profile>
-             <id>default-tools.jar</id>
-             <activation>
--                <property>
--                    <name>java.vendor</name>
--                    <value>Sun Microsystems Inc.</value>
--                </property>
-+                <file>
-+                    <exists>${java.home}/../lib/tools.jar</exists>
-+                </file>
-             </activation>
-             <dependencies>
-                 <dependency>
diff -Nru sezpoz-1.9/debian/patches/series sezpoz-1.10/debian/patches/series
--- sezpoz-1.9/debian/patches/series	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-build.patch
-fix-java7-compat.patch
diff -Nru sezpoz-1.9/debian/README.source sezpoz-1.10/debian/README.source
--- sezpoz-1.9/debian/README.source	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/README.source	2015-04-02 15:42:41.000000000 +0000
@@ -1,5 +1,5 @@
 Information about sezpoz
-------------------------------
+------------------------
 
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
diff -Nru sezpoz-1.9/debian/watch sezpoz-1.10/debian/watch
--- sezpoz-1.9/debian/watch	2011-12-30 19:39:22.000000000 +0000
+++ sezpoz-1.10/debian/watch	2015-04-02 14:30:19.000000000 +0000
@@ -1,4 +1,2 @@
 version=3
-opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
-  http://java.net/projects/sezpoz/sources/svn/show/tags \
-  /projects/sezpoz/sources/svn/show/tags/pom-(\d+).(\d+).* debian debian/orig-tar.sh
+https://github.com/jglick/sezpoz/releases .*/pom-([\d\.]+).tar.gz
diff -Nru sezpoz-1.9/demo/api/pom.xml sezpoz-1.10/demo/api/pom.xml
--- sezpoz-1.9/demo/api/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/demo/api/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,12 +3,12 @@
     <parent>
         <groupId>net.java.sezpoz.demo</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>api</artifactId>
     <packaging>jar</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz Demo API</name>
     <dependencies>
         <dependency>
diff -Nru sezpoz-1.9/demo/app/pom.xml sezpoz-1.10/demo/app/pom.xml
--- sezpoz-1.9/demo/app/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/demo/app/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,12 +3,12 @@
     <parent>
         <groupId>net.java.sezpoz.demo</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>app</artifactId>
     <packaging>jar</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz Demo Application</name>
     <dependencies>
         <dependency>
diff -Nru sezpoz-1.9/demo/plugin1/pom.xml sezpoz-1.10/demo/plugin1/pom.xml
--- sezpoz-1.9/demo/plugin1/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/demo/plugin1/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,12 +3,12 @@
     <parent>
         <groupId>net.java.sezpoz.demo</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>plugin1</artifactId>
     <packaging>jar</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz Demo Plugin #1</name>
     <dependencies>
         <dependency>
diff -Nru sezpoz-1.9/demo/plugin2/pom.xml sezpoz-1.10/demo/plugin2/pom.xml
--- sezpoz-1.9/demo/plugin2/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/demo/plugin2/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,12 +3,12 @@
     <parent>
         <groupId>net.java.sezpoz.demo</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>plugin2</artifactId>
     <packaging>jar</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz Demo Plugin #2</name>
     <dependencies>
         <dependency>
diff -Nru sezpoz-1.9/demo/pom.xml sezpoz-1.10/demo/pom.xml
--- sezpoz-1.9/demo/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/demo/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,13 +3,13 @@
     <parent>
         <groupId>net.java.sezpoz</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.java.sezpoz.demo</groupId>
     <artifactId>pom</artifactId>
     <packaging>pom</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz Demo</name>
     <build>
         <plugins>
diff -Nru sezpoz-1.9/.gitignore sezpoz-1.10/.gitignore
--- sezpoz-1.9/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ sezpoz-1.10/.gitignore	2015-03-31 21:06:50.000000000 +0000
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings/
+target/
diff -Nru sezpoz-1.9/perftest/pom.xml sezpoz-1.10/perftest/pom.xml
--- sezpoz-1.9/perftest/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/perftest/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,7 +3,7 @@
     <parent>
         <groupId>net.java.sezpoz</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9-SNAPSHOT</version>
+        <version>1.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>perftest</artifactId>
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>net.java.sezpoz</groupId>
             <artifactId>sezpoz</artifactId>
-            <version>1.4</version>
+            <version>1.9</version>
         </dependency>
     </dependencies>
     <properties>
diff -Nru sezpoz-1.9/pom.xml sezpoz-1.10/pom.xml
--- sezpoz-1.9/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -4,31 +4,28 @@
     <parent>
         <groupId>org.sonatype.oss</groupId>
         <artifactId>oss-parent</artifactId>
-        <version>7</version>
+        <version>9</version>
     </parent>
     <groupId>net.java.sezpoz</groupId>
     <artifactId>pom</artifactId>
     <packaging>pom</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz</name>
-    <url>http://sezpoz.java.net/</url>
+    <url>https://github.com/jglick/sezpoz</url>
     <description>SezPoz is a lightweight and simple-to-learn library that lets you perform modular service lookups.</description>
     <developers>
         <developer>
-            <email>jesse.glick@oracle.com</email>
+            <email>jglick@cloudbees.com</email>
             <name>Jesse Glick</name>
             <id>jglick</id>
         </developer>
     </developers>
     <scm>
-        <connection>scm:svn:http://svn.java.net/svn/sezpoz~svn/tags/pom-1.9</connection>
-        <developerConnection>scm:svn:https://svn.java.net/svn/sezpoz~svn/tags/pom-1.9</developerConnection>
-        <url>http://java.net/projects/sezpoz/sources/svn/show/tags/pom-1.9</url>
-    </scm>
-    <issueManagement>
-        <system>JIRA</system>
-        <url>http://java.net/jira/browse/SEZPOZ</url>
-    </issueManagement>
+        <connection>scm:git:git@github.com:jglick/sezpoz.git</connection>
+        <developerConnection>scm:git:git@github.com:jglick/sezpoz.git</developerConnection>
+        <url>git@github.com:jglick/sezpoz.git</url>
+      <tag>pom-1.10</tag>
+  </scm>
     <licenses>
         <license>
             <name>CDDL or GPL 2 with Classpath Exception</name>
@@ -40,17 +37,13 @@
             <plugins>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <version>2.3.2</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
                 <plugin>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.0</version>
-                </plugin>
-                <plugin>
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>2.3.1</version>
                 </plugin>
@@ -60,11 +53,11 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.4.3</version>
+                    <version>2.5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.8</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
@@ -80,7 +73,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>2.1.1</version>
+                    <version>3.0-beta-3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
diff -Nru sezpoz-1.9/README.md sezpoz-1.10/README.md
--- sezpoz-1.9/README.md	1970-01-01 00:00:00.000000000 +0000
+++ sezpoz-1.10/README.md	2015-03-31 21:06:50.000000000 +0000
@@ -0,0 +1,117 @@
+SezPoz is a lightweight and easy-to-learn library that lets you perform modular service lookups. It provides some of the same capabilities as (for example) `java.util.ServiceLoader`, Eclipse extension points, and NetBeans `Lookup` and XML layers. However, SezPoz has some special advantages:
+
+1.  The service registrations are made just using type-checked Java annotations. There are no configuration files to edit, and your Java IDE can show you registrations since they are simply usages of an annotation. On JDK 6 (or later), no special build or packaging steps are required (just javac). Looking up services just requires that you have a `ClassLoader` which can "see" all of the "modules" (as with `ServiceLoader`).
+
+2.  You can register individual objects (values of static fields or methods) instead of whole classes.
+
+3.  You can associate static metadata with each implementation, using regular annotation values. The caller can choose to inspect the metadata without loading the actual implementation object (as with Eclipse extension points).
+
+(Why the name? SezPoz "says" the "position" of your services. It is also a "[seznam][1] [poznámek][2]".)
+
+Sources are in the form of Maven projects. To build:
+
+    mvn install
+
+To try the demo application:
+
+    mvn -f demo/app/pom.xml exec:exec
+
+Binaries, sources, and Javadoc can all be downloaded from the Maven Central repository: [Maven repository][3].
+
+For usage from Maven applications, use the artifact `net.java.sezpoz:sezpoz`, for example:
+
+    <dependencies>
+      <dependency>
+        <groupId>net.java.sezpoz</groupId>
+        <artifactId>sezpoz</artifactId>
+        <version>…latest available…</version>
+      </dependency>
+    </dependencies>
+
+See Javadoc for details on particular classes, or just look at demo sources in the `demo` subdirectory in Subversion.
+
+Support for declaring, creating, and inspecting indices of annotated Java elements.
+
+For example, to permit registration of simple menu items, while making it possible to prepare a menu without loading any of them until they are actually selected:
+
+    @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+    @Retention(RetentionPolicy.SOURCE)
+    @Indexable(type=ActionListener.class)
+    public @interface MenuItem {
+        String menuName();
+        String itemName();
+        String iconPath() default "";
+    }
+
+A concrete registration might look like:
+
+    @MenuItem(menuName="File", itemName="Print", iconPath=".../print.png")
+    public class PrintAction extends AbstractAction {
+        public void actionPerformed(ActionEvent e) {...}
+    }
+
+Alternatively:
+
+    public class Actions {
+        @MenuItem(menuName="File", itemName="Print")
+        public static Action print() {...}
+    }
+
+or even:
+
+    public class Actions {
+        @MenuItem(menuName="File", itemName="Print")
+        public static final Action PRINT = ...;
+    }
+
+To create the index on JDK 6+, just compile your sources normally with javac. (The processor is in the same JAR as this API and should be autodetected.)
+
+Usage is then simple:
+
+    for (final IndexItem<MenuItem,ActionListener> item :
+            Index.load(MenuItem.class, ActionListener.class)) {
+        JMenu menu = new JMenu(item.annotation().menuName());
+        JMenuItem menuitem = new JMenuItem(item.annotation().itemName());
+        String icon = item.annotation().iconPath();
+        if (!icon.equals("")) {
+             menuitem.setIcon(new ImageIcon(icon));
+        }
+        menuitem.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                try {
+                    item.instance().actionPerformed(e);
+                } catch (InstantiationException x) {
+                    x.printStackTrace();
+                }
+            }
+        });
+    }
+
+
+Known limitations:
+
+1. Incremental compilation is not perfect. If you compile just some sources which are marked with an indexable annotation, these entries will be appended to any existing registrations from previous runs of the compiler. (You should run a clean build if you *delete* annotations from sources.)
+
+2.  The Java language spec currently prohibits recursive annotation definitions, and JDK 6 and 7's javac enforce this. See [bug #6264216][4].
+
+Eclipse-specific notes: make sure annotation processing is enabled at least for any projects registering objects using annotations. Make sure the SezPoz library is in the factory path for annotation processors. You also need to check the box **Run this container's processor in batch mode** from the **Advanced** button in **Java Compiler » Annotation Processing » Factory Path**. There does not appear to be any way for Eclipse to discover processors in the regular classpath as JSR 269 suggests, and there does not appear to be any way to make these settings apply automatically to all projects. Eclipse users are recommended to use javac (e.g. via Maven) to build. [Eclipse Help Page][5] [Eclipse bug #280542][6]
+
+SezPoz is used inside Hudson/Jenkins for the `@Extension` annotation, but this usage does not take advantage of its lazy-loading capability at all.
+
+[GlassFish/DependencyMechanism][7] looks a bit similar. In active use?
+
+[JPF][8] is similar to Eclipse, but can be used in isolation.
+
+[OSGi Declarative Services][9] can use Java annotations to register services, but static metadata looks weak compared to SezPoz.
+
+To be investigated: interoperability with Peaberry and/or Sisu.
+
+ [1]: http://slovnik.seznam.cz/search.py?wd=seznam&amp;lg=cz_en
+ [2]: http://slovnik.seznam.cz/search.py?wd=pozn%C3%A1mka&amp;lg=cz_en
+ [3]: http://repo1.maven.org/maven2/net/java/sezpoz/sezpoz/
+ [4]: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6264216
+ [5]: http://help.eclipse.org/ganymede/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_apt_getting_started.htm
+ [6]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=280542
+ [7]: https://wikis.oracle.com/display/GlassFish/DependencyMechanism
+ [8]: http://jpf.sourceforge.net/
+ [9]: http://wiki.osgi.org/wiki/Declarative_Services
diff -Nru sezpoz-1.9/sezpoz/pom.xml sezpoz-1.10/sezpoz/pom.xml
--- sezpoz-1.9/sezpoz/pom.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/pom.xml	2015-03-31 21:06:50.000000000 +0000
@@ -3,41 +3,26 @@
     <parent>
         <groupId>net.java.sezpoz</groupId>
         <artifactId>pom</artifactId>
-        <version>1.9</version>
+        <version>1.10</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sezpoz</artifactId>
     <packaging>jar</packaging>
-    <version>1.9</version>
+    <version>1.10</version>
     <name>SezPoz Library</name>
-    <profiles>
-        <profile>
-            <id>default-tools.jar</id>
-            <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>Sun Microsystems Inc.</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>sun.jdk</groupId>
-                    <artifactId>tools</artifactId>
-                    <version>1.5.0</version>
-                    <scope>system</scope>
-                    <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                    <optional>true</optional>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
+            <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-annotations</artifactId>
+            <version>1.9</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -49,6 +34,26 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.9</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <signature>
+                                <groupId>org.codehaus.mojo.signature</groupId>
+                                <artifactId>java16</artifactId>
+                                <version>1.0</version>
+                            </signature>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
@@ -56,8 +61,6 @@
                         <exclude>**/TestUtils.java</exclude>
                     </excludes>
                     <forkMode>pertest</forkMode>
-                    <!-- XXX addition of tools.jar is not automatic from above declaration - why? -->
-                    <argLine>-ea -Xbootclasspath/a:${java.home}/../lib/tools.jar</argLine>
                 </configuration>
             </plugin>
         </plugins>
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer5.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer5.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer5.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer5.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-/*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License ("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file.  This particular file is subject to the "Classpath"
- * exception as provided in the GPL Version 2 section of the License file
- * that accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package net.java.sezpoz.impl;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-import com.sun.mirror.declaration.AnnotationMirror;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeElementDeclaration;
-import com.sun.mirror.declaration.AnnotationValue;
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.EnumConstantDeclaration;
-import com.sun.mirror.declaration.FieldDeclaration;
-import com.sun.mirror.declaration.MethodDeclaration;
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.DeclaredType;
-import com.sun.mirror.type.TypeMirror;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import net.java.sezpoz.Indexable;
-
-/**
- * Processor for indexable annotations.
- */
-class Indexer5 implements AnnotationProcessor {
-
-    private final AnnotationProcessorEnvironment env;
-    /** map from indexable annotation names, to actual uses */
-    private final Map<String,List<SerAnnotatedElement>> output;
-
-    public Indexer5(Set<AnnotationTypeDeclaration> ignore, AnnotationProcessorEnvironment env) {
-        this.env = env;
-        output = new HashMap<String,List<SerAnnotatedElement>>();
-    }
-
-    public void process() {
-        // XXX how does getSpecifiedTypeDeclarations differ?
-        for (TypeDeclaration decl : env.getTypeDeclarations()) {
-            analyze(decl);
-            for (MethodDeclaration m : decl.getMethods()) {
-                analyze(m);
-            }
-            for (FieldDeclaration f : decl.getFields()) {
-                analyze(f);
-            }
-        }
-        for (Map.Entry<String,List<SerAnnotatedElement>> outputEntry : output.entrySet()) {
-            String annName = outputEntry.getKey();
-            try {
-                OutputStream os = env.getFiler().createBinaryFile(Filer.Location.CLASS_TREE, "",
-                        new File("META-INF" + File.separator + "annotations" + File.separator + annName));
-                try {
-                    ObjectOutputStream oos = new ObjectOutputStream(os);
-                    for (SerAnnotatedElement el : outputEntry.getValue()) {
-                        oos.writeObject(el);
-                    }
-                    oos.writeObject(null);
-                    oos.flush();
-                } finally {
-                    os.close();
-                }
-            } catch (IOException x) {
-                env.getMessager().printError(x.toString());
-            }
-        }
-    }
-
-    private void analyze(Declaration decl) {
-        for (AnnotationMirror ann : decl.getAnnotationMirrors()) {
-            // First check to see if it is an @Indexable annotation.
-            boolean indexable = false;
-            TypeMirror objType = null; // upper type bound on annotated elements, or null for Object.class
-            for (AnnotationMirror metaAnn : ann.getAnnotationType().getDeclaration().getAnnotationMirrors()) {
-                if (getQualifiedNameUsingShell(metaAnn.getAnnotationType().getDeclaration()).equals(Indexable.class.getName())) {
-                    // Yes it is. Now just find the type=... if there is one:
-                    Map<AnnotationTypeElementDeclaration,AnnotationValue> values = metaAnn.getElementValues();
-                    if (!values.isEmpty()) {
-                        AnnotationValue val = values.values().iterator().next();
-                        objType = (TypeMirror) val.getValue();
-                    }
-                    indexable = true;
-                    break;
-                }
-            }
-            if (!indexable) {
-                continue;
-            }
-            // XXX check that it is not @Inherited, and that it has the right @Target
-            // XXX check that decl is public
-            // XXX check that decl is static if a method, etc.
-            // XXX check that decl is assignable to objType if that is not null
-            String annName = getQualifiedNameUsingShell(ann.getAnnotationType().getDeclaration());
-            List<SerAnnotatedElement> existingOutput = output.get(annName);
-            if (existingOutput == null) {
-                existingOutput = new ArrayList<SerAnnotatedElement>();
-                output.put(annName, existingOutput);
-            }
-            existingOutput.add(makeSerAnnotatedElement(decl, ann.getElementValues()));
-        }
-    }
-
-    /**
-     * Similar to {@link TypeDeclaration#getQualifiedName} but uses p.O$I rather than p.O.I.
-     * In JDK 6 could use Elements.getBinaryName.
-     */
-    static String getQualifiedNameUsingShell(TypeDeclaration decl) {
-        TypeDeclaration outer = decl.getDeclaringType();
-        if (outer != null) {
-            return getQualifiedNameUsingShell(outer) + '$' + decl.getSimpleName();
-        } else {
-            return decl.getQualifiedName();
-        }
-    }
-
-    private SerAnnotatedElement makeSerAnnotatedElement(Declaration decl, Map<AnnotationTypeElementDeclaration,AnnotationValue> annvalues) {
-        String className, memberName;
-        boolean isMethod;
-        if (decl instanceof TypeDeclaration) {
-            className = getQualifiedNameUsingShell((TypeDeclaration) decl);
-            memberName = null;
-            isMethod = false;
-        } else if (decl instanceof MethodDeclaration) {
-            MethodDeclaration _decl = (MethodDeclaration) decl;
-            className = getQualifiedNameUsingShell(_decl.getDeclaringType());
-            memberName = _decl.getSimpleName();
-            isMethod = true;
-        } else {
-            FieldDeclaration _decl = (FieldDeclaration) decl;
-            className = getQualifiedNameUsingShell(_decl.getDeclaringType());
-            memberName = _decl.getSimpleName();
-            isMethod = false;
-        }
-        return new SerAnnotatedElement(className, memberName, isMethod, translate(annvalues));
-    }
-
-    private static TreeMap<String,Object> translate(Map<AnnotationTypeElementDeclaration,AnnotationValue> annvalues) {
-        TreeMap<String,Object> values = new TreeMap<String,Object>();
-        for (Map.Entry<AnnotationTypeElementDeclaration,AnnotationValue> entry : annvalues.entrySet()) {
-            String key = entry.getKey().getSimpleName();
-            AnnotationValue val = entry.getValue();
-            values.put(key, translate(val.getValue()));
-        }
-        return values;
-    }
-
-    private static Object translate(Object annval) {
-        if (annval instanceof Collection) {
-            @SuppressWarnings("unchecked")
-            Collection<AnnotationValue> annvals = (Collection) annval;
-            List<Object> values = new ArrayList<Object>(annvals.size());
-            for (AnnotationValue v : annvals) {
-                values.add(translate(v.getValue()));
-            }
-            return values;
-        } else if (annval instanceof TypeMirror) {
-            return new SerTypeConst(getQualifiedNameUsingShell(((DeclaredType) annval).getDeclaration()));
-        } else if (annval instanceof EnumConstantDeclaration) {
-            EnumConstantDeclaration ecd = (EnumConstantDeclaration) annval;
-            return new SerEnumConst(getQualifiedNameUsingShell(ecd.getDeclaringType()), ecd.getSimpleName());
-        } else if (annval instanceof AnnotationMirror) {
-            AnnotationMirror am = (AnnotationMirror) annval;
-            return new SerAnnConst(getQualifiedNameUsingShell(am.getAnnotationType().getDeclaration()),
-                    translate(am.getElementValues()));
-        } else {
-            return annval;
-        }
-    }
-
-}
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer6.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer6.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer6.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/Indexer6.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
@@ -70,10 +70,12 @@
 import javax.tools.FileObject;
 import javax.tools.StandardLocation;
 import net.java.sezpoz.Indexable;
+import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement;
 
 /**
  * Processor for indexable annotations.
  */
+@IgnoreJRERequirement
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 @SupportedAnnotationTypes("*")
 @SupportedOptions("sezpoz.quiet")
@@ -85,6 +87,7 @@
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         if (roundEnv.processingOver()) {
+            // TODO we should not write until processingOver
             return false;
         }
         for (Element indexable : roundEnv.getElementsAnnotatedWith(Indexable.class)) {
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/IndexerFactory.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/IndexerFactory.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/IndexerFactory.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/IndexerFactory.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License ("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file.  This particular file is subject to the "Classpath"
- * exception as provided in the GPL Version 2 section of the License file
- * that accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package net.java.sezpoz.impl;
-
-import com.sun.mirror.apt.AnnotationProcessor;
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * Factory for the processor.
- */
-public class IndexerFactory implements AnnotationProcessorFactory {
-
-    public IndexerFactory() {}
-
-    public Collection<String> supportedOptions() {
-        return Collections.emptySet();
-    }
-
-    public Collection<String> supportedAnnotationTypes() {
-        return Collections.singleton("*");
-    }
-
-    public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds, AnnotationProcessorEnvironment env) {
-        return new Indexer5(atds, env);
-    }
-    
-}
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnConst.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnConst.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnConst.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnConst.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnotatedElement.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnotatedElement.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnotatedElement.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerAnnotatedElement.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerEnumConst.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerEnumConst.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerEnumConst.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerEnumConst.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerTypeConst.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerTypeConst.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/impl/SerTypeConst.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/impl/SerTypeConst.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/Indexable.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/Indexable.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/Indexable.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/Indexable.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/IndexError.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/IndexError.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/IndexError.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/IndexError.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/IndexItem.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/IndexItem.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/IndexItem.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/IndexItem.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
@@ -96,7 +96,7 @@
      * @return a live or proxy annotation
      */
     public A annotation() {
-        return proxy(annotationType, structure.values);
+        return proxy(loader, annotationType, structure.values);
     }
 
     /**
@@ -215,10 +215,10 @@
         return "@" + annotationType.getName() + ":" + structure;
     }
 
-    private static <T extends Annotation> T proxy(Class<T> type, Map<String,Object> data) {
-        return type.cast(Proxy.newProxyInstance(type.getClassLoader(),
+    private static <T extends Annotation> T proxy(ClassLoader loader, Class<T> type, Map<String,Object> data) {
+        return type.cast(Proxy.newProxyInstance(loader,
                 new Class<?>[] {type},
-                new AnnotationProxy(type, data)));
+                new AnnotationProxy(loader, type, data)));
     }
 
     /**
@@ -226,12 +226,15 @@
      */
     private static final class AnnotationProxy implements InvocationHandler {
 
+        /** class loader to use */
+        private final ClassLoader loader;
         /** type of the annotation */
         private final Class<? extends Annotation> type;
         /** (non-default) annotation method values; value may be wrapped in Ser*Const objects or ArrayList */
         private final Map<String,Object> data;
 
-        public AnnotationProxy(Class<? extends Annotation> type, Map<String,Object> data) {
+        public AnnotationProxy(ClassLoader loader, Class<? extends Annotation> type, Map<String,Object> data) {
+            this.loader = loader;
             this.type = type;
             this.data = data;
         }
@@ -322,12 +325,12 @@
         private Object evaluate(Object o, Class<?> expectedType) throws Exception {
             if (o instanceof SerAnnConst) {
                 SerAnnConst a = (SerAnnConst) o;
-                return proxy(type.getClassLoader().loadClass(a.name).asSubclass(Annotation.class), a.values);
+                return proxy(loader, loader.loadClass(a.name).asSubclass(Annotation.class), a.values);
             } else if (o instanceof SerTypeConst) {
-                return type.getClassLoader().loadClass(((SerTypeConst) o).name);
+                return loader.loadClass(((SerTypeConst) o).name);
             } else if (o instanceof SerEnumConst) {
                 SerEnumConst e = (SerEnumConst) o;
-                return type.getClassLoader().loadClass(e.enumName).getField(e.constName).get(null);
+                return loader.loadClass(e.enumName).getField(e.constName).get(null);
             } else if (o instanceof ArrayList<?>) {
                 List<?> l = (List<?>) o;
                 Class<?> compType = expectedType.getComponentType();
diff -Nru sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/Index.java sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/Index.java
--- sezpoz-1.9/sezpoz/src/main/java/net/java/sezpoz/Index.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/java/net/java/sezpoz/Index.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory sezpoz-1.10/sezpoz/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
--- sezpoz-1.9/sezpoz/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/main/resources/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-net.java.sezpoz.impl.IndexerFactory
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/ClassLoaderTest.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/ClassLoaderTest.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/ClassLoaderTest.java	1970-01-01 00:00:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/ClassLoaderTest.java	2015-03-31 21:06:50.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License ("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file.  This particular file is subject to the "Classpath"
+ * exception as provided in the GPL Version 2 section of the License file
+ * that accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * The Original Software is SezPoz. The Initial Developer of the Original
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ */
+
+package net.java.sezpoz;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.Iterator;
+import java.util.concurrent.Callable;
+
+import net.java.sezpoz.impl.TestUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Check class loader issues.
+ * 
+ * @author Johannes Schindelin
+ */
+public class ClassLoaderTest {
+
+    private File dir, src1, clz1, src2, clz2;
+    private ClassLoader loader1, loader2;
+    @Before public void setUp() throws Exception {
+        dir = TestUtils.getWorkDir(this);
+        TestUtils.clearDir(dir);
+        src1 = new File(dir, "src1");
+        clz1 = new File(dir, "clz1");
+        clz1.mkdirs();
+        loader1 = new URLClassLoader(new URL[] {clz1.toURI().toURL()});
+        src2 = new File(dir, "src2");
+        clz2 = new File(dir, "clz2");
+        clz2.mkdirs();
+        loader2 = new URLClassLoader(new URL[] {clz2.toURI().toURL()}, loader1);
+    }
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @Test public void differentLoaders() throws Exception {
+        TestUtils.makeSource(src1, "api.MyAnnotation",
+                "import java.lang.annotation.ElementType;",
+                "import java.lang.annotation.Retention;",
+                "import java.lang.annotation.RetentionPolicy;",
+                "import java.lang.annotation.Target;",
+                "import java.util.concurrent.Callable;",
+                "import net.java.sezpoz.Indexable;",
+                "@Retention(RetentionPolicy.RUNTIME)",
+                "@Target(ElementType.TYPE)",
+                "@Indexable(type = Callable.class)",
+                "public @interface MyAnnotation {",
+                "Class<?> myClass();",
+                "}");
+        TestUtils.runApt(src1, null, clz1, new File[0], null);
+
+        TestUtils.makeSource(src2, "com.example.MyExample",
+                "import api.MyAnnotation;",
+                "import java.util.concurrent.Callable;",
+                "@MyAnnotation(myClass = MyExample.class)",
+                "public class MyExample implements Callable {",
+                "public Object call() {",
+                "return \"Hello, World!\";",
+                "}",
+                "}");
+        TestUtils.runApt(src2, null, clz2, new File[] {clz1}, null);
+
+        final Class annotationClass = loader1.loadClass("api.MyAnnotation");
+        final Class exampleClass = loader2.loadClass("com.example.MyExample");
+        final Index index = Index.load(annotationClass, Callable.class, loader2);
+
+        Iterator<IndexItem> it = index.iterator();
+        assertTrue(it.hasNext());
+        IndexItem item = it.next();
+        assertFalse(it.hasNext());
+
+        final Object annotation = item.annotation();
+        final Method myClassMethod = annotation.getClass().getMethod("myClass");
+        final Object myClass = myClassMethod.invoke(annotation);
+        assertEquals(myClass, exampleClass);
+    }
+
+}
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/AptFailedException.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/AptFailedException.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/AptFailedException.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/AptFailedException.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer5Test.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer5Test.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer5Test.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer5Test.java	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License ("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file.  This particular file is subject to the "Classpath"
- * exception as provided in the GPL Version 2 section of the License file
- * that accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-
-package net.java.sezpoz.impl;
-
-/**
- * Test for JDK 5 ("APT") version of indexer.
- */
-public class Indexer5Test extends IndexerTestBase {
-
-    protected boolean useJsr199() {
-        return false;
-    }
-
-}
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer6Test.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer6Test.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer6Test.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/Indexer6Test.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
@@ -45,10 +45,6 @@
  */
 public class Indexer6Test extends IndexerTestBase {
 
-    protected boolean useJsr199() {
-        return true;
-    }
-
     @Test public void incrementalCompilation() throws Exception {
         File src1 = new File(dir, "src1");
         TestUtils.makeSource(src1, "Thing",
@@ -60,20 +56,20 @@
                 "String name();",
                 "}");
         File clz1 = new File(dir, "clz1");
-        TestUtils.runApt(src1, null, clz1, null, null, useJsr199());
+        TestUtils.runApt(src1, null, clz1, null, null);
         File src2 = new File(dir, "src2");
         TestUtils.makeSource(src2, "Impl1",
                 "@Thing(name=\"one\")",
                 "public class Impl1 {}");
         File clz2 = new File(dir, "clz2");
-        TestUtils.runApt(src2, null, clz2, new File[] {clz1}, null, useJsr199());
+        TestUtils.runApt(src2, null, clz2, new File[] {clz1}, null);
         assertEquals(Collections.singletonMap("Thing", Collections.singleton(
                 "Impl1{name=one}"
                 )), TestUtils.findMetadata(clz2));
         TestUtils.makeSource(src2, "Impl2",
                 "@Thing(name=\"two\")",
                 "public class Impl2 {}");
-        TestUtils.runApt(src2, "Impl2", clz2, new File[] {clz1}, null, useJsr199());
+        TestUtils.runApt(src2, "Impl2", clz2, new File[] {clz1}, null);
         assertEquals(Collections.singletonMap("Thing", new TreeSet<String>(Arrays.asList(
                 "Impl1{name=one}",
                 "Impl2{name=two}"
@@ -91,26 +87,26 @@
                 "public @interface A {}");
         TestUtils.makeSource(src, "y.C1", "@x.A public class C1 {}");
         TestUtils.makeSource(src, "y.C2", "@x.A class C2 {}");
-        TestUtils.runApt(src, "A|C1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|C2", clz, null, "public", useJsr199());
+        TestUtils.runApt(src, "A|C1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|C2", clz, null, "public");
         TestUtils.makeSource(src, "y.M1", "public class M1 {@x.A public static Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M2", "public class M2 {@x.A static Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M3", "public class M3 {@x.A protected static Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M4", "public class M4 {@x.A private static Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M5", "class M1 {@x.A public static Object m() {return null;}}");
-        TestUtils.runApt(src, "A|M1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M2", clz, null, "public", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M3", clz, null, "public", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M4", clz, null, "public", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M5", clz, null, "public", useJsr199());
+        TestUtils.runApt(src, "A|M1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|M2", clz, null, "public");
+        TestUtils.runAptExpectingErrors(src, "A|M3", clz, null, "public");
+        TestUtils.runAptExpectingErrors(src, "A|M4", clz, null, "public");
+        TestUtils.runAptExpectingErrors(src, "A|M5", clz, null, "public");
         TestUtils.makeSource(src, "y.F1", "public class F1 {@x.A public static final Object f = null;}");
         TestUtils.makeSource(src, "y.F2", "public class F2 {@x.A static final Object f = null;}");
         TestUtils.makeSource(src, "y.F3", "public class F3 {@x.A private static final Object f = null;}");
         TestUtils.makeSource(src, "y.F4", "class F4 {@x.A public static final Object f = null;}");
-        TestUtils.runApt(src, "A|F1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|F2", clz, null, "public", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|F3", clz, null, "public", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|F4", clz, null, "public", useJsr199());
+        TestUtils.runApt(src, "A|F1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|F2", clz, null, "public");
+        TestUtils.runAptExpectingErrors(src, "A|F3", clz, null, "public");
+        TestUtils.runAptExpectingErrors(src, "A|F4", clz, null, "public");
     }
 
     @Test public void inappropriateModifiersOrArgs() throws Exception {
@@ -124,26 +120,26 @@
         TestUtils.makeSource(src, "y.C2", "@x.A public abstract class C2 {}");
         TestUtils.makeSource(src, "y.C3", "@x.A public class C3 {private C3() {}}");
         TestUtils.makeSource(src, "y.C4", "@x.A public class C4 {public C4(int x) {}}");
-        TestUtils.runApt(src, "A|C1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|C2", clz, null, "abstract", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|C3", clz, null, "constructor", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|C4", clz, null, "constructor", useJsr199());
+        TestUtils.runApt(src, "A|C1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|C2", clz, null, "abstract");
+        TestUtils.runAptExpectingErrors(src, "A|C3", clz, null, "constructor");
+        TestUtils.runAptExpectingErrors(src, "A|C4", clz, null, "constructor");
         TestUtils.makeSource(src, "y.M1", "public class M1 {@x.A public static Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M2", "public class M2 {@x.A public Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M3", "public class M3 {@x.A public static Object m(int x) {return null;}}");
-        TestUtils.runApt(src, "A|M1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M2", clz, null, "static", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M3", clz, null, "parameters", useJsr199());
+        TestUtils.runApt(src, "A|M1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|M2", clz, null, "static");
+        TestUtils.runAptExpectingErrors(src, "A|M3", clz, null, "parameters");
         TestUtils.makeSource(src, "y.F1", "public class F1 {@x.A public static final Object f = null;}");
         TestUtils.makeSource(src, "y.F2", "public class F2 {@x.A public final Object f = null;}");
         TestUtils.makeSource(src, "y.F3", "public class F3 {@x.A public static Object f = null;}");
-        TestUtils.runApt(src, "A|F1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|F2", clz, null, "static", useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|F3", clz, null, "final", useJsr199());
+        TestUtils.runApt(src, "A|F1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|F2", clz, null, "static");
+        TestUtils.runAptExpectingErrors(src, "A|F3", clz, null, "final");
         TestUtils.makeSource(src, "y.N1", "public class N1 {@x.A public static class N {}}");
         TestUtils.makeSource(src, "y.N2", "public class N2 {@x.A public class N {}}");
-        TestUtils.runApt(src, "A|N1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|N2", clz, null, "static", useJsr199());
+        TestUtils.runApt(src, "A|N1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|N2", clz, null, "static");
         /* XXX 269 processors will not even see this:
         TestUtils.makeSource(src, "y.N3", "public class N3 {void m() {@x.A class N {}}}");
         TestUtils.runAptExpectingErrors(src, "A|N3", clz, null, "static", useJsr199());
@@ -159,20 +155,20 @@
                 "public @interface A {}");
         TestUtils.makeSource(src, "y.C1", "@x.A public class C1 implements Runnable {public void run() {}}");
         TestUtils.makeSource(src, "y.C2", "@x.A public class C2 {}");
-        TestUtils.runApt(src, "A|C1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|C2", clz, null, "Runnable", useJsr199());
+        TestUtils.runApt(src, "A|C1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|C2", clz, null, "Runnable");
         TestUtils.makeSource(src, "y.M1", "public class M1 {@x.A public static Runnable m() {return null;}}");
         TestUtils.makeSource(src, "y.M2", "public class M2 {@x.A public static Object m() {return null;}}");
         TestUtils.makeSource(src, "y.M3", "public class M3 implements Runnable {@x.A public static M3 m() {return null;} public void run() {}}");
-        TestUtils.runApt(src, "A|M1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|M2", clz, null, "Runnable", useJsr199());
-        TestUtils.runApt(src, "A|M3", clz, null, null, useJsr199());
+        TestUtils.runApt(src, "A|M1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|M2", clz, null, "Runnable");
+        TestUtils.runApt(src, "A|M3", clz, null, null);
         TestUtils.makeSource(src, "y.F1", "public class F1 {@x.A public static final Runnable f = null;}");
         TestUtils.makeSource(src, "y.F2", "public class F2 {@x.A public static final Object f = null;}");
         TestUtils.makeSource(src, "y.F3", "public class F3 implements Runnable {@x.A public static final F3 f = null; public void run() {}}");
-        TestUtils.runApt(src, "A|F1", clz, null, null, useJsr199());
-        TestUtils.runAptExpectingErrors(src, "A|F2", clz, null, "Runnable", useJsr199());
-        TestUtils.runApt(src, "A|F3", clz, null, null, useJsr199());
+        TestUtils.runApt(src, "A|F1", clz, null, null);
+        TestUtils.runAptExpectingErrors(src, "A|F2", clz, null, "Runnable");
+        TestUtils.runApt(src, "A|F3", clz, null, null);
     }
 
     @Test public void inappropriateIndexable() throws Exception {
@@ -182,7 +178,7 @@
                 "@Retention(RetentionPolicy.SOURCE)",
                 "@net.java.sezpoz.Indexable",
                 "public @interface A1 {}");
-        TestUtils.runApt(src, "A1", clz, null, null, useJsr199());
+        TestUtils.runApt(src, "A1", clz, null, null);
         TestUtils.makeSource(src, "x.A2",
                 "import java.lang.annotation.*;",
                 "@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})",
@@ -190,33 +186,33 @@
                 "@Inherited",
                 "@net.java.sezpoz.Indexable",
                 "public @interface A2 {}");
-        TestUtils.runAptExpectingErrors(src, "A2", clz, null, "@Inherited", useJsr199());
+        TestUtils.runAptExpectingErrors(src, "A2", clz, null, "@Inherited");
         TestUtils.makeSource(src, "x.A3",
                 "import java.lang.annotation.*;",
                 "@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR})",
                 "@Retention(RetentionPolicy.SOURCE)",
                 "@net.java.sezpoz.Indexable",
                 "public @interface A3 {}");
-        TestUtils.runAptExpectingErrors(src, "A3", clz, null, "CONSTRUCTOR", useJsr199());
+        TestUtils.runAptExpectingErrors(src, "A3", clz, null, "CONSTRUCTOR");
         TestUtils.makeSource(src, "x.A4",
                 "@net.java.sezpoz.Indexable",
                 "@Retention(RetentionPolicy.SOURCE)",
                 "public @interface A4 {}");
-        TestUtils.runAptExpectingErrors(src, "A4", clz, null, "@Target", useJsr199());
+        TestUtils.runAptExpectingErrors(src, "A4", clz, null, "@Target");
         TestUtils.makeSource(src, "x.A5",
                 "import java.lang.annotation.*;",
                 "@Target({})",
                 "@Retention(RetentionPolicy.SOURCE)",
                 "@net.java.sezpoz.Indexable",
                 "public @interface A5 {}");
-        TestUtils.runAptExpectingErrors(src, "A5", clz, null, "@Target", useJsr199());
+        TestUtils.runAptExpectingErrors(src, "A5", clz, null, "@Target");
         TestUtils.makeSource(src, "x.A6",
                 "import java.lang.annotation.*;",
                 "@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})",
                 "@net.java.sezpoz.Indexable",
                 "public @interface A6 {}");
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        TestUtils.runApt(src, "A6", clz, null, baos, useJsr199());
+        TestUtils.runApt(src, "A6", clz, null, baos);
         baos.flush();
         assertTrue("output warns about @Retention: " + baos, baos.toString().contains("@Retention"));
     }
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/IndexerTestBase.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/IndexerTestBase.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/IndexerTestBase.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/IndexerTestBase.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
@@ -48,8 +48,6 @@
  */
 public abstract class IndexerTestBase {
 
-    protected abstract boolean useJsr199();
-
     protected File dir, src, clz;
     @Before public void setUp() throws Exception {
         dir = TestUtils.getWorkDir(this);
@@ -71,7 +69,7 @@
                 "String iconPath() default \"\";",
                 "}");
         File clz1 = new File(dir, "clz1");
-        TestUtils.runApt(src1, null, clz1, null, null, useJsr199());
+        TestUtils.runApt(src1, null, clz1, null, null);
         File src2 = new File(dir, "src2");
         TestUtils.makeSource(src2, "impl.PrintAction",
                 "@api.MenuItem(menuName=\"File\", itemName=\"Print\", iconPath=\".../print.png\")",
@@ -80,7 +78,7 @@
                 "public void actionPerformed(java.awt.event.ActionEvent e) {}",
                 "}");
         File clz2 = new File(dir, "clz2");
-        TestUtils.runApt(src2, null, clz2, new File[] {clz1}, null, useJsr199());
+        TestUtils.runApt(src2, null, clz2, new File[] {clz1}, null);
         assertEquals(Collections.singletonMap("api.MenuItem", Collections.singleton(
                 "impl.PrintAction{iconPath=.../print.png, itemName=Print, menuName=File}"
                 )), TestUtils.findMetadata(clz2));
@@ -98,7 +96,7 @@
         TestUtils.makeSource(src, "y.C",
                 "@x.A(x=\"foo\\\\\\\"\\n\")",
                 "public class C {}");
-        TestUtils.runApt(src, null, clz, null, null, useJsr199());
+        TestUtils.runApt(src, null, clz, null, null);
         assertEquals(Collections.singletonMap("x.A", Collections.singleton(
                 "y.C{x=foo\\\"\n}"
                 )), TestUtils.findMetadata(clz));
@@ -126,7 +124,7 @@
                 "import x.*;",
                 "@A(other=@Other(v=1),others=@Other(v=2),i=3,b=true,c='x')",
                 "public class C {}");
-        TestUtils.runApt(src, null, clz, null, null, useJsr199());
+        TestUtils.runApt(src, null, clz, null, null);
         assertEquals(Collections.singletonMap("x.A", Collections.singleton(
                 "y.C{b=true, c=x, i=3, other=@x.Other{v=1}, others=[@x.Other{v=2}]}"
                 )), TestUtils.findMetadata(clz));
@@ -165,7 +163,7 @@
                 "import x.*;",
                 "@B(as={@A, @A(), @A(i=20)})",
                 "public class C5 {}");
-        TestUtils.runApt(src, null, clz, null, null, useJsr199());
+        TestUtils.runApt(src, null, clz, null, null);
         Map<String,Set<String>> expected = new HashMap<String,Set<String>>();
         expected.put("x.A", new TreeSet<String>(Arrays.asList(new String[] {
             "y.C1{i=33}",
@@ -195,7 +193,7 @@
                 "import x.*;",
                 "@A(clazz=String.class,enoom={E.ONE,E.TWO})",
                 "public class C {}");
-        TestUtils.runApt(src, null, clz, null, null, useJsr199());
+        TestUtils.runApt(src, null, clz, null, null);
         assertEquals(Collections.singletonMap("x.A", Collections.singleton(
                 "y.C{clazz=java.lang.String, enoom=[ONE, TWO]}"
                 )), TestUtils.findMetadata(clz));
@@ -218,7 +216,7 @@
                 "@A(b=false)",
                 "public static Object m() {return null;}",
                 "}");
-        TestUtils.runApt(src, null, clz, null, null, useJsr199());
+        TestUtils.runApt(src, null, clz, null, null);
         assertEquals(Collections.singletonMap("x.A", new TreeSet<String>(Arrays.asList(new String[] {
                 "y.C#F{b=true}",
                 "y.C#m(){b=false}",
@@ -242,7 +240,7 @@
                 "@x.Outer.A(type=T.class)",
                 "public static class C {}",
                 "}");
-        TestUtils.runApt(src, null, clz, null, null, useJsr199());
+        TestUtils.runApt(src, null, clz, null, null);
         assertEquals(Collections.singletonMap("x.Outer$A", Collections.singleton(
                 "y.Auter$C{type=y.Auter$T}"
                 )), TestUtils.findMetadata(clz));
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/TestUtils.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/TestUtils.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/impl/TestUtils.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/impl/TestUtils.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
@@ -93,20 +93,18 @@
     }
 
     /**
-     * Run the apt tool.
+     * Run annotation processing.
      * @param src a source root (runs apt on all *.java it finds)
      * @param srcIncludes optional regex to limit class names to compile
      * @param dest a dest dir (also compiles classes there)
      * @param cp classpath entries for processor (Indexable will always be accessible), or null
      * @param stderr output stream to use, or null for test console
-     * @param jsr199 whether to use JSR 199 (i.e. JDK 6 javac) annotation processing
-     * @throws AptFailedException if processing failed
      * @throws Exception if something unexpected went wrong
      */
-    public static void runApt(File src, String srcIncludes, File dest, File[] cp, OutputStream stderr, boolean jsr199) throws Exception {
+    public static void runApt(File src, String srcIncludes, File dest, File[] cp, OutputStream stderr) throws Exception {
         List<String> args = new ArrayList<String>();
         String indexableLoc = new File(URI.create(Indexable.class.getProtectionDomain().getCodeSource().getLocation().toExternalForm())).getAbsolutePath();
-        args.add(jsr199 ? "-processorpath" : "-factorypath");
+        args.add("-processorpath");
         args.add(indexableLoc);
         args.add("-classpath");
         StringBuffer b = new StringBuffer(indexableLoc);
@@ -122,18 +120,9 @@
         dest.mkdirs();
         args.add("-Asezpoz.quiet=true");
         scan(args, src, srcIncludes);
-        if (!jsr199) {
-            args.add("-proc:none");
-        }
         //System.err.println("running apt with args: " + args);
         String[] argsA = args.toArray(new String[args.size()]);
-        int res;
-        if (jsr199) {
-            res = ToolProvider.getSystemJavaCompiler().run(null, null, stderr, argsA);
-            //res = com.sun.tools.javac.Main.compile(argsA, stderr);
-        } else {
-            res = com.sun.tools.apt.Main.process(new PrintWriter(stderr != null ? stderr : System.err), argsA);
-        }
+        int res = ToolProvider.getSystemJavaCompiler().run(null, null, stderr, argsA);
         if (res != 0) {
             throw new AptFailedException(res);
         }
@@ -149,19 +138,18 @@
     }
 
     /**
-     * Run the apt tool and expect an error to be issued.
+     * Run annotation processing and expect an error to be issued.
      * @param src a source root (runs apt on all *.java it finds)
      * @param srcIncludes optional regex to limit class names to compile
      * @param dest a dest dir (also compiles classes there)
      * @param cp classpath entries for processor (Indexable will always be accessible), or null
      * @param error an error you expect to see printed (APT must also fail), else assertion failure
-     * @param jsr199 whether to use JSR 199 (i.e. JDK 6 javac) annotation processing
      * @throws Exception if something unexpected went wrong
      */
-    public static void runAptExpectingErrors(File src, String srcIncludes, File dest, File[] cp, String error, boolean jsr199) throws Exception {
+    public static void runAptExpectingErrors(File src, String srcIncludes, File dest, File[] cp, String error) throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         try {
-            runApt(src, srcIncludes, dest, cp, baos, jsr199);
+            runApt(src, srcIncludes, dest, cp, baos);
             Assert.fail("annotation processing should have failed");
         } catch (AptFailedException x) {
             String log = baos.toString();
diff -Nru sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/IndexTest.java sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/IndexTest.java
--- sezpoz-1.9/sezpoz/src/test/java/net/java/sezpoz/IndexTest.java	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/sezpoz/src/test/java/net/java/sezpoz/IndexTest.java	2015-03-31 21:06:50.000000000 +0000
@@ -15,8 +15,8 @@
  * "Portions Copyrighted [year] [name of copyright owner]"
  *
  * The Original Software is SezPoz. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 2006-2010 Sun
- * Microsystems, Inc. All Rights Reserved.
+ * Software is Sun Microsystems, Inc. Copyright 2006-2011 Oracle
+ * Corporation. All Rights Reserved.
  *
  * If you wish your version of this file to be governed by only the CDDL
  * or only the GPL Version 2, indicate your decision by adding
@@ -91,7 +91,7 @@
                 "public class PrintAction extends javax.swing.AbstractAction {",
                 "public void actionPerformed(java.awt.event.ActionEvent e) {}",
                 "}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         Class menuItemClazz = loader.loadClass("api.MenuItem");
         Index index = Index.load(menuItemClazz, Action.class, loader);
         Iterator<IndexItem> it = index.iterator();
@@ -146,7 +146,7 @@
                 "public class C {}");
         TestUtils.runApt(src, null, clz, new File[] {
             new File(URI.create(Marker.class.getProtectionDomain().getCodeSource().getLocation().toExternalForm()))
-        }, null, false);
+        }, null);
         int cnt = 0;
         for (IndexItem<Marker,Object> item : Index.load(Marker.class, Object.class, loader)) {
             cnt++;
@@ -179,7 +179,7 @@
                 "@x.A",
                 "public static Object m() {return 2;}",
                 "}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         Class<? extends Annotation> a = loader.loadClass("x.A").asSubclass(Annotation.class);
         int cnt = 0;
         for (IndexItem item : Index.load(a, Object.class, loader)) {
@@ -206,14 +206,14 @@
         TestUtils.makeSource(src, "y.C1",
                 "@x.A",
                 "public class C1 {}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         File src2 = new File(dir, "src2");
         TestUtils.makeSource(src2, "z.C2",
                 "@x.A",
                 "public class C2 {}");
         File clz2 = new File(dir, "clz2");
         clz2.mkdirs();
-        TestUtils.runApt(src2, null, clz2, new File[] {clz}, null, false);
+        TestUtils.runApt(src2, null, clz2, new File[] {clz}, null);
         loader = new URLClassLoader(new URL[] {clz.toURI().toURL(), clz2.toURI().toURL()});
         Class<? extends Annotation> a = loader.loadClass("x.A").asSubclass(Annotation.class);
         Iterator it = Index.load(a, Object.class, loader).iterator();
@@ -241,14 +241,14 @@
         TestUtils.makeSource(src, "y.C1",
                 "@x.A(x=1)",
                 "public class C1 {}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         File src2 = new File(dir, "src2");
         TestUtils.makeSource(src2, "y.C1",
                 "@x.A(x=2)",
                 "public class C1 {}");
         File clz2 = new File(dir, "clz2");
         clz2.mkdirs();
-        TestUtils.runApt(src2, null, clz2, new File[] {clz}, null, false);
+        TestUtils.runApt(src2, null, clz2, new File[] {clz}, null);
         loader = new URLClassLoader(new URL[] {clz.toURI().toURL(), clz2.toURI().toURL()});
         Class<? extends Annotation> a = loader.loadClass("x.A").asSubclass(Annotation.class);
         Iterator it = Index.load(a, Object.class, loader).iterator();
@@ -274,7 +274,7 @@
         TestUtils.makeSource(src, "y.C1",
                 "@x.A(x=1)",
                 "public class C1 {}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         URL[] urls = new URL[9]; // too slow to make this really big
         for (int i = 0; i < urls.length; i++) {
             urls[i] = new URL(new URL("http://" + i + ".nowhere.net/"), "", new URLStreamHandler() {
@@ -311,13 +311,13 @@
                 "import x.A;",
                 "public class C {",
                 "@A",
-                "public static void m1() {}",
+                "public static Void m1() {return null;}",
                 "@A(x=5)",
-                "public static void m2() {}",
+                "public static Void m2() {return null;}",
                 "@A(x=17)",
-                "public static void m3() {}",
+                "public static Void m3() {return null;}",
                 "}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         Class<? extends Annotation> a = loader.loadClass("x.A").asSubclass(Annotation.class);
         int cnt = 0;
         Annotation[] proxyAnns = new Annotation[3];
@@ -395,7 +395,7 @@
                 "c=A.Nested.class",
                 ")",
                 "public class C {}");
-        TestUtils.runApt(src, null, clz, new File[0], null, false);
+        TestUtils.runApt(src, null, clz, new File[0], null);
         Class<? extends Annotation> a = loader.loadClass("x.A").asSubclass(Annotation.class);
         IndexItem item = Index.load(a, Object.class, loader).iterator().next();
         Class<?> b = loader.loadClass("x.B");
diff -Nru sezpoz-1.9/www/alm-process/snippets/page.xml sezpoz-1.10/www/alm-process/snippets/page.xml
--- sezpoz-1.9/www/alm-process/snippets/page.xml	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/www/alm-process/snippets/page.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<page visibility="1"><component_list><component visibility="1" type="ProjectMetadata" order="1"><title localize="false"></title></component><component visibility="1" type="Html" order="2"><title localize="false"></title><filename>index.html</filename></component><component visibility="1" type="Subproject" order="3"><title localize="true">Subprojects</title></component></component_list></page>
diff -Nru sezpoz-1.9/www/index.html sezpoz-1.10/www/index.html
--- sezpoz-1.9/www/index.html	2011-06-03 13:22:00.000000000 +0000
+++ sezpoz-1.10/www/index.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,186 +0,0 @@
-<html>
-<head>
-<title>SezPoz</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<body>
-
-<h1>Introduction</h1>
-<p>
-SezPoz is a lightweight and easy-to-learn library that lets you perform modular service lookups.
-It provides some of the same capabilities as (for example) <code>java.util.ServiceLoader</code>,
-Eclipse extension points, and NetBeans <code>Lookup</code> and XML layers.
-However, SezPoz has some special advantages:
-</p>
-<ol>
-  <li>
-      <p>
-      The service registrations are made just using type-checked Java annotations.
-      There are no configuration files to edit, and your Java IDE can show you registrations since they are simply usages of an annotation.
-      On JDK 6 (or later), no special build or packaging steps are required (just javac); on JDK 5, you just need to run APT (with default arguments),
-      instead of or in addition to javac for any sources which may contain indexable items.
-      Looking up services just requires that you have a <code>ClassLoader</code> which can "see" all of the "modules" (as with <code>ServiceLoader</code>).
-      </p>
-  </li>
-  <li>
-      <p>
-      You can register individual objects (values of static fields or methods) instead of whole classes.
-      </p>
-  </li>
-  <li>
-      <p>
-      You can associate static metadata with each implementation, using regular annotation values.
-      The caller can choose to inspect the metadata without loading the actual implementation object (as with Eclipse extension points).
-      </p>
-  </li>
-</ol>
-<p>
-(Why the name? SezPoz "says" the "position" of your services. It is also a
-"<a href="http://slovnik.seznam.cz/search.py?wd=seznam&amp;lg=cz_en">seznam</a>
-<a href="http://slovnik.seznam.cz/search.py?wd=pozn%C3%A1mka&amp;lg=cz_en">poznámek</a>".)
-</p>
-
-<h1>Sources and Binaries</h1>
-<p>
-Sources are in the form of Maven projects. To build:
-</p>
-<pre>
-mvn install
-</pre>
-<p>
-To try the demo application:
-</p>
-<pre>
-mvn -f demo/app/pom.xml exec:exec
-</pre>
-<p>
-Binaries, sources, and Javadoc can all be downloaded from the
-<a href="http://download.java.net/maven/2/net/java/sezpoz/sezpoz/">Maven repository</a>.
-</p>
-<p>
-For usage from Maven applications, add the java.net repository
-(<a href="https://maven2-repository.dev.java.net/">details</a>)
-and use the artifact <code>net.java.sezpoz:sezpoz</code>, for example:
-</p>
-<pre>
-&lt;repositories>
-  &lt;repository>
-    &lt;id>java.net&lt;/id>
-    &lt;name>java.net&lt;/name>
-    &lt;url>http://download.java.net/maven/2/&lt;/url>
-  &lt;/repository>
-&lt;/repositories>
-&lt;dependencies>
-  &lt;dependency>
-    &lt;groupId>net.java.sezpoz&lt;/groupId>
-    &lt;artifactId>sezpoz&lt;/artifactId>
-    &lt;version><em>(...latest available...)</em>&lt;/version>
-  &lt;/dependency>
-&lt;/dependencies>
-</pre>
-
-<h1>Usage Summary</h1>
-<p>
-See Javadoc for details on particular classes, or just look at
-<a href="http://download.java.net/maven/2/net/java/sezpoz/demo/">demo sources</a>.
-<p>
-
-Support for declaring, creating, and inspecting indices of annotated Java elements.
- <p>
- For example, to permit registration of simple menu items, while
- making it possible to prepare a menu without loading any of them
- until they are actually selected:
- <pre>
- @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
- @Retention(RetentionPolicy.SOURCE)
- @Indexable(type=ActionListener.class)
- public @interface MenuItem {
-     String menuName();
-     String itemName();
-     String iconPath() default "";
- }
- </pre>
- A concrete registration might look like:
- <pre>
- @MenuItem(menuName="File", itemName="Print", iconPath=".../print.png")
- public class PrintAction extends AbstractAction {
-     public void actionPerformed(ActionEvent e) {...}
- }
- </pre>
- Alternatively:
- <pre>
- public class Actions {
-     @MenuItem(menuName="File", itemName="Print")
-     public static Action print() {...}
- }
- </pre>
- or even:
- <pre>
- public class Actions {
-     @MenuItem(menuName="File", itemName="Print")
-     public static final Action PRINT = ...;
- }
- </pre>
- To create the index on JDK 6, just compile your sources normally with javac.
- If using JDK 5, simply run apt instead of/in addition to javac.
- (The processor is in the same JAR as this API and should be autodetected.)
- <p>
- Usage is then simple:
- <pre>
- for (final IndexItem&lt;MenuItem,ActionListener&gt; item :
-         Index.load(MenuItem.class, ActionListener.class)) {
-     JMenu menu = new JMenu(item.annotation().menuName());
-     JMenuItem menuitem = new JMenuItem(item.annotation().itemName());
-     String icon = item.annotation().iconPath();
-     if (!icon.equals("")) {
-          menuitem.setIcon(new ImageIcon(icon));
-     }
-     menuitem.addActionListener(new ActionListener() {
-         public void actionPerformed(ActionEvent e) {
-             try {
-                 item.instance().actionPerformed(e);
-             } catch (InstantiationException x) {
-                 x.printStackTrace();
-             }
-         }
-     });
- }
- </pre>
-
-<h1>Notes</h1>
-<p>
-Known limitations:
-</p>
-<ol>
-<li><p>When using JDK 5 and apt, incremental compilation can result in an index file being generated with only some
-of the desired entries, if other source files are omitted e.g. by Ant.
-</p><p>
-This scenario works better using JDK 6's javac: if you compile just some sources which are marked with an indexable annotation,
-these entries will be appended to any existing registrations from previous runs of the compiler.
-(You should run a clean build if you <em>delete</em> annotations from sources.)
-</p></li>
-<li><p>The Java language spec currently prohibits recursive annotation definitions,
-although javac in JDK 5 does not. (JDK 6 and 7's javac do.)
-See <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6264216">bug #6264216</a>.</p></li>
-</ol>
-
-<p>
-Eclipse-specific notes: make sure annotation processing is enabled at least for any
-projects registering objects using annotations. Make sure the SezPoz library is
-in the factory path for annotation processors. You also need to check the box
-<b>Run this container's processor in batch mode</b> from the <b>Advanced</b>
-button in <b>Java Compiler > Annotation Processing > Factory Path</b>.
-There does not appear to be any way for Eclipse to discover processors
-in the regular classpath as JSR 269 suggests, and there does not appear to be
-any way to make these settings apply automatically to all projects.
-Eclipse users are recommended to use javac (e.g. via Maven) to build.
-<a href="http://help.eclipse.org/ganymede/index.jsp?topic=/org.eclipse.jdt.doc.isv/guide/jdt_apt_getting_started.htm">Eclipse Help Page</a>
-<a href="https://bugs.eclipse.org/bugs/show_bug.cgi?id=280542">Eclipse bug #280542</a>
-</p>
-
-</body>
-</html>
-<!-- perhaps mention: http://wiki.glassfish.java.net/Wiki.jsp?page=DependencyMechanism -->
-<!-- similar to Eclipse: http://jpf.sourceforge.net/ -->
-<!-- can mention that Hudson now uses it -->
-<!-- investigate interoperability with Peaberry -->