From c92d8c3ee7684193bd85e3a3bc6c42273f2305ec Mon Sep 17 00:00:00 2001
From: Bob Lee <crazybob@crazybob.org>
Date: Wed, 29 Apr 2009 00:39:35 +0000
Subject: Repackaged as javax.inject.

git-svn-id: https://atinject.googlecode.com/svn/trunk@3 3bc8319c-20ab-11de-9edc-3f40a397ab60
---
 atinject.ipr                              |   5 +-
 javadoc/allclasses-frame.html             |  14 +-
 javadoc/allclasses-noframe.html           |  14 +-
 javadoc/constant-values.html              |  14 +-
 javadoc/deprecated-list.html              |  14 +-
 javadoc/help-doc.html                     |  14 +-
 javadoc/index-files/index-1.html          |  22 +-
 javadoc/index-files/index-2.html          |  20 +-
 javadoc/index-files/index-3.html          |  28 +--
 javadoc/index-files/index-4.html          |  28 +--
 javadoc/index-files/index-5.html          |  20 +-
 javadoc/index-files/index-6.html          |  20 +-
 javadoc/index-files/index-7.html          |  20 +-
 javadoc/index.html                        |   6 +-
 javadoc/javax/inject/Inject.html          | 332 ++++++++++++++++++++++++++++++
 javadoc/javax/inject/Named.html           | 209 +++++++++++++++++++
 javadoc/javax/inject/Provider.html        | 226 ++++++++++++++++++++
 javadoc/javax/inject/Qualifier.html       | 210 +++++++++++++++++++
 javadoc/javax/inject/Scope.html           | 215 +++++++++++++++++++
 javadoc/javax/inject/Singleton.html       | 169 +++++++++++++++
 javadoc/javax/inject/package-frame.html   |  51 +++++
 javadoc/javax/inject/package-summary.html | 209 +++++++++++++++++++
 javadoc/javax/inject/package-tree.html    | 150 ++++++++++++++
 javadoc/org/atinject/Inject.html          | 332 ------------------------------
 javadoc/org/atinject/Named.html           | 209 -------------------
 javadoc/org/atinject/Provider.html        | 226 --------------------
 javadoc/org/atinject/Qualifier.html       | 210 -------------------
 javadoc/org/atinject/Scope.html           | 215 -------------------
 javadoc/org/atinject/Singleton.html       | 169 ---------------
 javadoc/org/atinject/package-frame.html   |  51 -----
 javadoc/org/atinject/package-summary.html | 206 ------------------
 javadoc/org/atinject/package-tree.html    | 150 --------------
 javadoc/overview-tree.html                |  24 +--
 javadoc/package-list                      |   2 +-
 src/javax/inject/Inject.java              | 157 ++++++++++++++
 src/javax/inject/Named.java               |  17 ++
 src/javax/inject/Provider.java            |  36 ++++
 src/javax/inject/Qualifier.java           |  58 ++++++
 src/javax/inject/Scope.java               |  63 ++++++
 src/javax/inject/Singleton.java           |  15 ++
 src/javax/inject/package-info.java        |  23 +++
 src/org/atinject/Inject.java              | 157 --------------
 src/org/atinject/Named.java               |  17 --
 src/org/atinject/Provider.java            |  36 ----
 src/org/atinject/Qualifier.java           |  58 ------
 src/org/atinject/Scope.java               |  63 ------
 src/org/atinject/Singleton.java           |  15 --
 src/org/atinject/package-info.java        |  17 --
 48 files changed, 2274 insertions(+), 2262 deletions(-)
 create mode 100644 javadoc/javax/inject/Inject.html
 create mode 100644 javadoc/javax/inject/Named.html
 create mode 100644 javadoc/javax/inject/Provider.html
 create mode 100644 javadoc/javax/inject/Qualifier.html
 create mode 100644 javadoc/javax/inject/Scope.html
 create mode 100644 javadoc/javax/inject/Singleton.html
 create mode 100644 javadoc/javax/inject/package-frame.html
 create mode 100644 javadoc/javax/inject/package-summary.html
 create mode 100644 javadoc/javax/inject/package-tree.html
 delete mode 100644 javadoc/org/atinject/Inject.html
 delete mode 100644 javadoc/org/atinject/Named.html
 delete mode 100644 javadoc/org/atinject/Provider.html
 delete mode 100644 javadoc/org/atinject/Qualifier.html
 delete mode 100644 javadoc/org/atinject/Scope.html
 delete mode 100644 javadoc/org/atinject/Singleton.html
 delete mode 100644 javadoc/org/atinject/package-frame.html
 delete mode 100644 javadoc/org/atinject/package-summary.html
 delete mode 100644 javadoc/org/atinject/package-tree.html
 create mode 100644 src/javax/inject/Inject.java
 create mode 100644 src/javax/inject/Named.java
 create mode 100644 src/javax/inject/Provider.java
 create mode 100644 src/javax/inject/Qualifier.java
 create mode 100644 src/javax/inject/Scope.java
 create mode 100644 src/javax/inject/Singleton.java
 create mode 100644 src/javax/inject/package-info.java
 delete mode 100644 src/org/atinject/Inject.java
 delete mode 100644 src/org/atinject/Named.java
 delete mode 100644 src/org/atinject/Provider.java
 delete mode 100644 src/org/atinject/Qualifier.java
 delete mode 100644 src/org/atinject/Scope.java
 delete mode 100644 src/org/atinject/Singleton.java
 delete mode 100644 src/org/atinject/package-info.java

diff --git a/atinject.ipr b/atinject.ipr
index 133b6ff..a1aa219 100644
--- a/atinject.ipr
+++ b/atinject.ipr
@@ -73,7 +73,7 @@
     <option name="OPTION_DOCUMENT_TAG_VERSION" value="false" />
     <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
     <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" />
+    <option name="OTHER_OPTIONS" value="-header &quot;&lt;font color='red'&gt;&lt;b&gt;This is a DRAFT specification.&lt;/b&gt;&lt;/font&gt;&quot;" />
     <option name="HEAP_SIZE" />
     <option name="LOCALE" />
     <option name="OPEN_IN_BROWSER" value="true" />
@@ -211,6 +211,9 @@
     <option name="projectName" value="atinject" />
   </component>
   <component name="ProjectFileVersion" converted="true" />
+  <component name="ProjectKey">
+    <option name="state" value="project:///Users/crazybob/projects/atinject/atinject.ipr" />
+  </component>
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/atinject.iml" filepath="$PROJECT_DIR$/atinject.iml" />
diff --git a/javadoc/allclasses-frame.html b/javadoc/allclasses-frame.html
index 525618b..50a11fa 100644
--- a/javadoc/allclasses-frame.html
+++ b/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 All Classes
 </TITLE>
@@ -20,17 +20,17 @@ All Classes
 
 <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
 <TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/atinject/Inject.html" title="annotation in org.atinject" target="classFrame">Inject</A>
+<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="javax/inject/Inject.html" title="annotation in javax.inject" target="classFrame">Inject</A>
 <BR>
-<A HREF="org/atinject/Named.html" title="annotation in org.atinject" target="classFrame">Named</A>
+<A HREF="javax/inject/Named.html" title="annotation in javax.inject" target="classFrame">Named</A>
 <BR>
-<A HREF="org/atinject/Provider.html" title="interface in org.atinject" target="classFrame"><I>Provider</I></A>
+<A HREF="javax/inject/Provider.html" title="interface in javax.inject" target="classFrame"><I>Provider</I></A>
 <BR>
-<A HREF="org/atinject/Qualifier.html" title="annotation in org.atinject" target="classFrame">Qualifier</A>
+<A HREF="javax/inject/Qualifier.html" title="annotation in javax.inject" target="classFrame">Qualifier</A>
 <BR>
-<A HREF="org/atinject/Scope.html" title="annotation in org.atinject" target="classFrame">Scope</A>
+<A HREF="javax/inject/Scope.html" title="annotation in javax.inject" target="classFrame">Scope</A>
 <BR>
-<A HREF="org/atinject/Singleton.html" title="annotation in org.atinject" target="classFrame">Singleton</A>
+<A HREF="javax/inject/Singleton.html" title="annotation in javax.inject" target="classFrame">Singleton</A>
 <BR>
 </FONT></TD>
 </TR>
diff --git a/javadoc/allclasses-noframe.html b/javadoc/allclasses-noframe.html
index d5e2351..7f8094c 100644
--- a/javadoc/allclasses-noframe.html
+++ b/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 All Classes
 </TITLE>
@@ -20,17 +20,17 @@ All Classes
 
 <TABLE BORDER="0" WIDTH="100%" SUMMARY="">
 <TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/atinject/Inject.html" title="annotation in org.atinject">Inject</A>
+<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="javax/inject/Inject.html" title="annotation in javax.inject">Inject</A>
 <BR>
-<A HREF="org/atinject/Named.html" title="annotation in org.atinject">Named</A>
+<A HREF="javax/inject/Named.html" title="annotation in javax.inject">Named</A>
 <BR>
-<A HREF="org/atinject/Provider.html" title="interface in org.atinject"><I>Provider</I></A>
+<A HREF="javax/inject/Provider.html" title="interface in javax.inject"><I>Provider</I></A>
 <BR>
-<A HREF="org/atinject/Qualifier.html" title="annotation in org.atinject">Qualifier</A>
+<A HREF="javax/inject/Qualifier.html" title="annotation in javax.inject">Qualifier</A>
 <BR>
-<A HREF="org/atinject/Scope.html" title="annotation in org.atinject">Scope</A>
+<A HREF="javax/inject/Scope.html" title="annotation in javax.inject">Scope</A>
 <BR>
-<A HREF="org/atinject/Singleton.html" title="annotation in org.atinject">Singleton</A>
+<A HREF="javax/inject/Singleton.html" title="annotation in javax.inject">Singleton</A>
 <BR>
 </FONT></TD>
 </TR>
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index 68854e8..2367f70 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 Constant Field Values
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -93,9 +93,9 @@ Constant Field Values</H1>
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -103,7 +103,7 @@ Constant Field Values</H1>
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index 89b7711..722ce8c 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 Deprecated List
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -93,9 +93,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -103,7 +103,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index e9c13ce..71e08d0 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 API Help
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -160,9 +160,9 @@ This help file applies to API documentation generated using the standard doclet.
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
@@ -170,7 +170,7 @@ This help file applies to API documentation generated using the standard doclet.
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html
index e7eeffc..4c10f96 100644
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 G-Index
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,12 +72,12 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 <A NAME="_G_"><!-- --></A><H2>
 <B>G</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/Provider.html#get()"><B>get()</B></A> - 
-Method in interface org.atinject.<A HREF="../org/atinject/Provider.html" title="interface in org.atinject">Provider</A>
+<DT><A HREF="../javax/inject/Provider.html#get()"><B>get()</B></A> - 
+Method in interface javax.inject.<A HREF="../javax/inject/Provider.html" title="interface in javax.inject">Provider</A>
 <DD>Provides an instance of <code>T</code>.
 </DL>
 <HR>
@@ -92,9 +92,9 @@ Method in interface org.atinject.<A HREF="../org/atinject/Provider.html" title="
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -102,7 +102,7 @@ Method in interface org.atinject.<A HREF="../org/atinject/Provider.html" title="
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -131,7 +131,7 @@ Method in interface org.atinject.<A HREF="../org/atinject/Provider.html" title="
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html
index 2f15616..cd0368b 100644
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 I-Index
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,11 +72,11 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 <A NAME="_I_"><!-- --></A><H2>
 <B>I</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/Inject.html" title="annotation in org.atinject"><B>Inject</B></A> - Annotation Type in <A HREF="../org/atinject/package-summary.html">org.atinject</A><DD>Identifies injectable constructors, methods, and fields.</DL>
+<DT><A HREF="../javax/inject/Inject.html" title="annotation in javax.inject"><B>Inject</B></A> - Annotation Type in <A HREF="../javax/inject/package-summary.html">javax.inject</A><DD>Identifies injectable constructors, methods, and fields.</DL>
 <HR>
 
 
@@ -89,9 +89,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -99,7 +99,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -128,7 +128,7 @@ function windowTitle()
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html
index 016f5dc..fe9bfc8 100644
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
-N-Index
+J-Index
 </TITLE>
 
 
@@ -13,7 +13,7 @@ N-Index
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="N-Index";
+    parent.document.title="J-Index";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,11 +72,11 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
-<A NAME="_N_"><!-- --></A><H2>
-<B>N</B></H2>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A NAME="_J_"><!-- --></A><H2>
+<B>J</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/Named.html" title="annotation in org.atinject"><B>Named</B></A> - Annotation Type in <A HREF="../org/atinject/package-summary.html">org.atinject</A><DD>String-based <A HREF="../org/atinject/Qualifier.html" title="annotation in org.atinject">qualifier</A>.</DL>
+<DT><A HREF="../javax/inject/package-summary.html"><B>javax.inject</B></A> - package javax.inject<DD>Provides annotations for dependency injection.</DL>
 <HR>
 
 
@@ -89,9 +89,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -99,7 +99,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -128,7 +128,7 @@ function windowTitle()
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html
index 3459703..374efe3 100644
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
@@ -2,9 +2,9 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
-O-Index
+N-Index
 </TITLE>
 
 
@@ -13,7 +13,7 @@ O-Index
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="O-Index";
+    parent.document.title="N-Index";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,11 +72,11 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
-<A NAME="_O_"><!-- --></A><H2>
-<B>O</B></H2>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A NAME="_N_"><!-- --></A><H2>
+<B>N</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/package-summary.html"><B>org.atinject</B></A> - package org.atinject<DD>Provides annotations for dependency injection.</DL>
+<DT><A HREF="../javax/inject/Named.html" title="annotation in javax.inject"><B>Named</B></A> - Annotation Type in <A HREF="../javax/inject/package-summary.html">javax.inject</A><DD>String-based <A HREF="../javax/inject/Qualifier.html" title="annotation in javax.inject">qualifier</A>.</DL>
 <HR>
 
 
@@ -89,9 +89,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -99,7 +99,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -128,7 +128,7 @@ function windowTitle()
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html
index a7254a7..fbbedc1 100644
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 P-Index
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,11 +72,11 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 <A NAME="_P_"><!-- --></A><H2>
 <B>P</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/Provider.html" title="interface in org.atinject"><B>Provider</B></A>&lt;<A HREF="../org/atinject/Provider.html" title="type parameter in Provider">T</A>&gt; - Interface in <A HREF="../org/atinject/package-summary.html">org.atinject</A><DD>Provides instances of <code>T</code>.</DL>
+<DT><A HREF="../javax/inject/Provider.html" title="interface in javax.inject"><B>Provider</B></A>&lt;<A HREF="../javax/inject/Provider.html" title="type parameter in Provider">T</A>&gt; - Interface in <A HREF="../javax/inject/package-summary.html">javax.inject</A><DD>Provides instances of <code>T</code>.</DL>
 <HR>
 
 
@@ -89,9 +89,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -99,7 +99,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -128,7 +128,7 @@ function windowTitle()
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html
index 20ab32f..09615f8 100644
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 Q-Index
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,11 +72,11 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 <A NAME="_Q_"><!-- --></A><H2>
 <B>Q</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/Qualifier.html" title="annotation in org.atinject"><B>Qualifier</B></A> - Annotation Type in <A HREF="../org/atinject/package-summary.html">org.atinject</A><DD>Identifies qualifier annotations.</DL>
+<DT><A HREF="../javax/inject/Qualifier.html" title="annotation in javax.inject"><B>Qualifier</B></A> - Annotation Type in <A HREF="../javax/inject/package-summary.html">javax.inject</A><DD>Identifies qualifier annotations.</DL>
 <HR>
 
 
@@ -89,9 +89,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -99,7 +99,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -128,7 +128,7 @@ function windowTitle()
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html
index f355ced..f43d870 100644
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 S-Index
 </TITLE>
@@ -33,9 +33,9 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -72,11 +72,11 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 <A NAME="_S_"><!-- --></A><H2>
 <B>S</B></H2>
 <DL>
-<DT><A HREF="../org/atinject/Scope.html" title="annotation in org.atinject"><B>Scope</B></A> - Annotation Type in <A HREF="../org/atinject/package-summary.html">org.atinject</A><DD>Identifies scope annotations.<DT><A HREF="../org/atinject/Singleton.html" title="annotation in org.atinject"><B>Singleton</B></A> - Annotation Type in <A HREF="../org/atinject/package-summary.html">org.atinject</A><DD>Identifies a type that the injector only instantiates once.</DL>
+<DT><A HREF="../javax/inject/Scope.html" title="annotation in javax.inject"><B>Scope</B></A> - Annotation Type in <A HREF="../javax/inject/package-summary.html">javax.inject</A><DD>Identifies scope annotations.<DT><A HREF="../javax/inject/Singleton.html" title="annotation in javax.inject"><B>Singleton</B></A> - Annotation Type in <A HREF="../javax/inject/package-summary.html">javax.inject</A><DD>Identifies a type that the injector only instantiates once.</DL>
 <HR>
 
 
@@ -89,9 +89,9 @@ function windowTitle()
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../org/atinject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../javax/inject/package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
@@ -99,7 +99,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -128,7 +128,7 @@ function windowTitle()
 <A NAME="skip-navbar_bottom"></A>
 <!-- ======== END OF BOTTOM NAVBAR ======= -->
 
-<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">N</A> <A HREF="index-4.html">O</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
+<A HREF="index-1.html">G</A> <A HREF="index-2.html">I</A> <A HREF="index-3.html">J</A> <A HREF="index-4.html">N</A> <A HREF="index-5.html">P</A> <A HREF="index-6.html">Q</A> <A HREF="index-7.html">S</A> <HR>
 
 </BODY>
 </HTML>
diff --git a/javadoc/index.html b/javadoc/index.html
index ddbba08..92c5514 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Sat Apr 04 14:00:41 PDT 2009-->
+<!-- Generated by javadoc on Tue Apr 28 17:34:50 PDT 2009-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>
@@ -22,7 +22,7 @@ Generated Documentation (Untitled)
 </HEAD>
 <FRAMESET cols="20%,80%" title="" onLoad="top.loadFrames()">
 <FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-<FRAME src="org/atinject/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
+<FRAME src="javax/inject/package-summary.html" name="classFrame" title="Package, class and interface descriptions" scrolling="yes">
 <NOFRAMES>
 <H2>
 Frame Alert</H2>
@@ -30,7 +30,7 @@ Frame Alert</H2>
 <P>
 This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
 <BR>
-Link to<A HREF="org/atinject/package-summary.html">Non-frame version.</A>
+Link to<A HREF="javax/inject/package-summary.html">Non-frame version.</A>
 </NOFRAMES>
 </FRAMESET>
 </HTML>
diff --git a/javadoc/javax/inject/Inject.html b/javadoc/javax/inject/Inject.html
new file mode 100644
index 0000000..17b52f8
--- /dev/null
+++ b/javadoc/javax/inject/Inject.html
@@ -0,0 +1,332 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+Inject
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject.Inject class">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="Inject";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV CLASS&nbsp;
+&nbsp;<A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Inject.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Inject.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+javax.inject</FONT>
+<BR>
+Annotation Type Inject</H2>
+<HR>
+<DL>
+<DT><PRE><FONT SIZE="-1">@Target(value={METHOD,CONSTRUCTOR,FIELD})
+@Retention(value=RUNTIME)
+@Documented
+</FONT>public @interface <B>Inject</B></DL>
+</PRE>
+
+<P>
+Identifies injectable constructors, methods, and fields. Applies to static
+ as well as instance members. An injectable member may have any access
+ modifier (private, package-private, protected, public). Constructors are
+ injected first, followed by fields, and then methods. Fields and methods
+ in superclasses are injected before those in subclasses. Ordering of
+ injection among fields and among methods in the same class is not specified.
+ Which values are injected depends upon the injector implementation and its
+ configuration.
+ 
+ <p>Injectable constructors are annotated with <code>@Inject</code> and accept
+ zero or more dependencies as arguments. <code>@Inject</code> can apply to at most
+ one constructor per class.
+
+ <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
+       <i>ConstructorModifiers<sub>opt</sub></i>
+       <i>SimpleTypeName</i>(<i>FormalParameterList<sub>opt</sub></i>)
+       <i>Throws<sub>opt</sub></i>
+       <i>ConstructorBody</i></blockquote></tt>
+
+ <p><code>@Inject</code> is optional for public, no-argument constructors when no
+ other constructors are present. This enables injectors to invoke default
+ constructors.
+
+ <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">
+       @Inject<sub><i>opt</i></sub>
+       <i>Annotations<sub>opt</sub></i>
+       public
+       <i>SimpleTypeName</i>()
+       <i>Throws<sub>opt</sub></i>
+       <i>ConstructorBody</i></blockquote></tt>
+
+ <p>Injectable fields:
+ <ul>
+   <li>are annotated with <code>@Inject</code>.
+   <li>are not final.
+   <li>may have any otherwise valid name.</li></ul>
+
+ <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
+       <i>FieldModifiers<sub>opt</sub></i>
+       <i>Type</i>
+       <i>VariableDeclarators</i>;</blockquote></tt>
+
+ <p>Injectable methods:
+ <ul>
+   <li>are annotated with <code>@Inject</code>.</li>
+   <li>are not abstract.</li>
+   <li>do not declare type parameters of their own.</li>
+   <li>return <code>void</code>.</li>
+   <li>may have any otherwise valid name.</li>
+   <li>accept zero or more dependencies as arguments.</li></ul>
+
+ <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
+       <i>MethodModifiers<sub>opt</sub></i>
+       void
+       <i>Identifier</i>(<i>FormalParameterList<sub>opt</sub></i>)
+       <i>Throws<sub>opt</sub></i>
+       <i>MethodBody</i></blockquote></tt>
+
+ <p>For example:
+
+ <pre>
+   public class Car {
+     // Injectable constructor
+     &#064;Inject public Car(Engine engine) { ... }
+
+     // Injectable field
+     &#064;Inject private Provider&lt;Seat> seatProvider;
+
+     // Injectable package-private method
+     &#064;Inject void install(Windshield windshield, Trunk trunk) { ... }
+   }</pre>
+
+ <p>A method annotated with <code>@Inject</code> that overrides another method
+ annotated with <code>@Inject</code> will only be injected once per injection
+ request per instance. A method with <i>no</i> <code>@Inject</code> annotation
+ that overrides a method annotated with <code>@Inject</code> will not be
+ injected.
+
+ <p>Injection of members annotated with <code>@Inject</code> is required by
+ default. This behavior can be overridden by setting <A HREF="../../javax/inject/Inject.html#optional()"><CODE>optional</CODE></A> equal to <code>true</code>.
+
+ <p>Detecting and resolving circular dependencies is left as an exercize for
+ the injector implementation. Circular dependencies between two constructors
+ is an obvious problem, but you can also have a circular dependency between
+ injectable fields or methods:
+
+ <pre>
+   class A {
+     &#064;Inject B b;
+   }
+   class B {
+     &#064;Inject A a;
+   }</pre>
+
+ <p>When constructing an instance of <code>A</code>, a naive injector
+ implementation might go into an infinite loop constructing an instance of
+ <code>B</code> to set on <code>A</code>, a second instance of <code>A</code> to set on
+ <code>B</code>, a second instance of <code>B</code> to set on the second instance of
+ <code>A</code>, and so on.
+
+ <p>A conservative injector might detect the circular dependency at build
+ time and generate an error, at which point the programmer could break the
+ circular dependency by injecting <A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><CODE>Provider&lt;A></CODE></A> or <code>Provider&lt;B&gt;</code> instead of <code>A</code> or <code>B</code> respectively. Calling <A HREF="../../javax/inject/Provider.html#get()"><CODE>get()</CODE></A> on the provider directly from the constructor or
+ method it was injected into defeats the provider's ability to break up
+ circular dependencies. In the case of method or field injection, scoping
+ one of the dependencies (using <A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject">singleton scope</A>, for
+ example) may also enable a valid circular relationship.
+<P>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject"><CODE>@Qualifier</CODE></A>, 
+<A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><CODE>Provider</CODE></A></DL>
+<HR>
+
+<P>
+<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
+
+<A NAME="annotation_type_optional_element_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Optional Element Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../javax/inject/Inject.html#optional()">optional</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Whether or not injection is optional.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+<A NAME="optional()"><!-- --></A><H3>
+optional</H3>
+<PRE>
+public abstract boolean <B>optional</B></PRE>
+<DL>
+<DD>Whether or not injection is optional. If <code>true</code>, the injector's
+ behavior varies depending on the type of injection point:
+
+ <p><ul>
+   <li><b>Constructors:</b> <i>Not allowed</i></li>
+   <li><b>Fields:</b> If a dependency matching the field can't
+     be found, the injector will not set the field.</li>
+   <li><b>Methods:</b> If a dependency matching a method parameter can't
+     be found, the injector will skip invoking the method entirely, even
+     if other arguments could be provided.</li>
+ </ul>
+ 
+ <p>If an applicable dependency has been configured but the injector
+ encounters an error while resolving the dependency (a transitive
+ dependency could be missing, for example), the injector should generate
+ an error, not skip the injection. For example:
+
+ <pre>
+   &#064;Inject(optional=true) Gps gps;</pre>
+
+ <p>If a Gps isn't available at all, the injector will simply not set the
+ <code>gps</code> field. If a Gps is available but an algorithm it depends
+ upon can't be found, the injector will generate an error.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+<DL>
+<DT><B>Default:</B><DD>false</DD>
+</DL>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV CLASS&nbsp;
+&nbsp;<A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Inject.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Inject.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/Named.html b/javadoc/javax/inject/Named.html
new file mode 100644
index 0000000..add733b
--- /dev/null
+++ b/javadoc/javax/inject/Named.html
@@ -0,0 +1,209 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+Named
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject.Named class">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="Named";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Inject.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Named.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Named.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+javax.inject</FONT>
+<BR>
+Annotation Type Named</H2>
+<HR>
+<DL>
+<DT><PRE><FONT SIZE="-1"><A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject">@Qualifier</A>
+@Documented
+@Retention(value=RUNTIME)
+</FONT>public @interface <B>Named</B></DL>
+</PRE>
+
+<P>
+String-based <A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject">qualifier</A>.
+<P>
+
+<P>
+<HR>
+
+<P>
+<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
+
+<A NAME="annotation_type_required_element_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Required Element Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../javax/inject/Named.html#value()">value</A></B></CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The name.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
+
+<A NAME="annotation_type_element_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Element Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="value()"><!-- --></A><H3>
+value</H3>
+<PRE>
+public abstract java.lang.String <B>value</B></PRE>
+<DL>
+<DD>The name.
+<P>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Inject.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Named.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Named.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/Provider.html b/javadoc/javax/inject/Provider.html
new file mode 100644
index 0000000..af72046
--- /dev/null
+++ b/javadoc/javax/inject/Provider.html
@@ -0,0 +1,226 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+Provider
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject.Provider interface">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="Provider";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Provider.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Provider.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+javax.inject</FONT>
+<BR>
+Interface Provider&lt;T&gt;</H2>
+<HR>
+<DL>
+<DT><PRE>public interface <B>Provider&lt;T&gt;</B></DL>
+</PRE>
+
+<P>
+Provides instances of <code>T</code>. For any type <code>T</code> that can be
+ injected, you can also inject <code>Provider&lt;T&gt;</code>. Compared to injecting
+ <code>T</code> directly, injecting <code>Provider&lt;T&gt;</code> enables:
+
+ <ul>
+   <li>retrieving multiple instances.</li>
+   <li>lazy or optional retrieval of an instance.</li>
+   <li>breaking circular dependencies.</li>
+   <li>abstracting scope so you can look up an instance in a smaller scope
+      from an instance in a containing scope.</li>
+ </ul>
+
+ <p>For example:
+
+ <pre>
+   class Car {
+     &#064;Inject Car(Provider&lt;Seat> seatProvider) {
+       Seat driver = seatProvider.get();
+       Seat passenger = seatProvider.get();
+       ...
+     }
+   }</pre>
+<P>
+
+<P>
+<HR>
+
+<P>
+
+<!-- ========== METHOD SUMMARY =========== -->
+
+<A NAME="method_summary"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Method Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="../../javax/inject/Provider.html" title="type parameter in Provider">T</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../javax/inject/Provider.html#get()">get</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides an instance of <code>T</code>.</TD>
+</TR>
+</TABLE>
+&nbsp;
+<P>
+
+<!-- ============ METHOD DETAIL ========== -->
+
+<A NAME="method_detail"><!-- --></A>
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
+<B>Method Detail</B></FONT></TH>
+</TR>
+</TABLE>
+
+<A NAME="get()"><!-- --></A><H3>
+get</H3>
+<PRE>
+<A HREF="../../javax/inject/Provider.html" title="type parameter in Provider">T</A> <B>get</B>()</PRE>
+<DL>
+<DD>Provides an instance of <code>T</code>.
+<P>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Provider.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Provider.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/Qualifier.html b/javadoc/javax/inject/Qualifier.html
new file mode 100644
index 0000000..5e20a25
--- /dev/null
+++ b/javadoc/javax/inject/Qualifier.html
@@ -0,0 +1,210 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+Qualifier
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject.Qualifier class">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="Qualifier";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Qualifier.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Qualifier.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;ELEMENT</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+javax.inject</FONT>
+<BR>
+Annotation Type Qualifier</H2>
+<HR>
+<DL>
+<DT><PRE><FONT SIZE="-1">@Target(value=ANNOTATION_TYPE)
+@Retention(value=RUNTIME)
+@Documented
+</FONT>public @interface <B>Qualifier</B></DL>
+</PRE>
+
+<P>
+Identifies qualifier annotations. A qualifier annotates an injectable field
+ or parameter and, combined with the type, identifies the implementation to
+ inject. Qualifiers are optional and no more than one should annotate a
+ single field or parameter. The qualifiers are bold in the following
+ example:
+
+ <pre>
+   public class Car {
+     &#064;Inject private <b>@Leather</b> Provider&lt;Seat> seatProvider;
+
+     &#064;Inject void install(<b>@Tinted</b> Windshield windshield,
+         <b>@Big</b> Trunk trunk) { ... }
+   }</pre>
+
+ <p>If one injectable method overrides another, the overriding method's
+ parameters do not automatically inherit qualifiers from the overridden
+ method's parameters.
+
+ <p>Anyone can define a new qualifier. A qualifier annotation:
+ <ul>
+   <li>is annotated with <code>@Qualifier</code>, <code>@Retention(RUNTIME)</code>,
+      and typically <code>@Documented</code>.</li>
+   <li>can have attributes.</li>
+   <li>is <i>not</i> annotated with <code>@Target</code>. While this
+      specification only covers applying qualifiers to fields and parameters,
+      some injector configurations might use qualifier annotations in other
+      places (on methods or classes for example).</li>
+   <li>may be part of the public API, much like the dependency type, but
+      unlike implementation types which needn't be part of the public
+      API.</li>
+ </ul>
+
+ <p>For example:
+
+ <pre>
+   &#064;java.lang.annotation.Documented
+   &#064;java.lang.annotation.Retention(RUNTIME)
+   &#064;javax.inject.Qualifier
+   public @interface Leather {
+     Color color() default Color.TAN;
+     public enum Color { RED, BLACK, TAN }
+   }</pre>
+<P>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><CODE>@Named</CODE></A></DL>
+
+<P>
+
+<P>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Qualifier.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Qualifier.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;ELEMENT</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/Scope.html b/javadoc/javax/inject/Scope.html
new file mode 100644
index 0000000..3df56a6
--- /dev/null
+++ b/javadoc/javax/inject/Scope.html
@@ -0,0 +1,215 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+Scope
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject.Scope class">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="Scope";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Scope.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Scope.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;ELEMENT</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+javax.inject</FONT>
+<BR>
+Annotation Type Scope</H2>
+<HR>
+<DL>
+<DT><PRE><FONT SIZE="-1">@Target(value=ANNOTATION_TYPE)
+@Retention(value=RUNTIME)
+@Documented
+</FONT>public @interface <B>Scope</B></DL>
+</PRE>
+
+<P>
+Identifies scope annotations. A scope annotation applies to a class
+ containing an injectable constructor and governs how the injector reuses
+ instances of the type. By default, if no scope annotation is present, the
+ injector creates an instance (by injecting the type's constructor), uses
+ the instance for one injection, and then forgets it. If a scope annotation
+ is present, the injector may retain the instance for possible reuse in a
+ later injection. If multiple threads can access a scoped instance, its
+ implementation should be thread safe. The implementation of the scope
+ itself is left up to the injector.
+
+ <p>In the following example, the scope annotation <code>@Singleton</code> ensures
+ that we only have one Log instance:
+
+ <pre>
+   &#064;Singleton
+   class Log {
+     void log(String message) { ... }
+   }</pre>
+ 
+ <p>The injector generates an error if it encounters more than one scope
+ annotation on the same class or a scope annotation it doesn't support.
+
+ <p>A scope annotation:
+ <ul>
+   <li>is annotated with <code>@Scope</code>, <code>@Retention(RUNTIME)</code>,
+      and typically <code>@Documented</code>.</li>
+   <li>should not have attributes.</li>
+   <li>is typically not <code>@Inherited</code>, so scoping is orthogonal to
+      implementation inheritance.</li>
+   <li>is <i>not</i> annotated with <code>@Target</code>. While this
+      specification only covers applying scopes to classes, some injector
+      configurations might use scopes in other places (on factory
+      method results for example).</li>
+ </ul>
+
+ <p>For example:
+
+ <pre>
+   &#064;java.lang.annotation.Documented
+   &#064;java.lang.annotation.Retention(RUNTIME)
+   &#064;javax.inject.Scope
+   public @interface RequestScoped {}</pre>
+
+ <p>Annotating scope annotations with <code>@Scope</code> helps the injector
+ detect the case where a programmer used the scope annotation on a class but
+ forgot to configure the scope in the injector. A conservative injector
+ would generate an error rather than not apply a scope.
+<P>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject"><CODE>@Singleton</CODE></A></DL>
+
+<P>
+
+<P>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject"><B>NEXT CLASS</B></A></FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Scope.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Scope.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;ELEMENT</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/Singleton.html b/javadoc/javax/inject/Singleton.html
new file mode 100644
index 0000000..f8bb89b
--- /dev/null
+++ b/javadoc/javax/inject/Singleton.html
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+Singleton
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject.Singleton class">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="Singleton";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;NEXT CLASS</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Singleton.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Singleton.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;ELEMENT</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<!-- ======== START OF CLASS DATA ======== -->
+<H2>
+<FONT SIZE="-1">
+javax.inject</FONT>
+<BR>
+Annotation Type Singleton</H2>
+<HR>
+<DL>
+<DT><PRE><FONT SIZE="-1"><A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject">@Scope</A>
+@Documented
+@Retention(value=RUNTIME)
+</FONT>public @interface <B>Singleton</B></DL>
+</PRE>
+
+<P>
+Identifies a type that the injector only instantiates once. Not inherited.
+<P>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><CODE>@Scope</CODE></A></DL>
+
+<P>
+
+<P>
+<!-- ========= END OF CLASS DATA ========= -->
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;<A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;NEXT CLASS</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/Singleton.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="Singleton.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+<TR>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
+<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
+DETAIL:&nbsp;ELEMENT</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/package-frame.html b/javadoc/javax/inject/package-frame.html
new file mode 100644
index 0000000..0a3b4bc
--- /dev/null
+++ b/javadoc/javax/inject/package-frame.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+javax.inject
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject package">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+
+</HEAD>
+
+<BODY BGCOLOR="white">
+<FONT size="+1" CLASS="FrameTitleFont">
+<A HREF="../../javax/inject/package-summary.html" target="classFrame">javax.inject</A></FONT>
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Interfaces</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="Provider.html" title="interface in javax.inject" target="classFrame"><I>Provider</I></A></FONT></TD>
+</TR>
+</TABLE>
+
+
+<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
+<TR>
+<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
+Annotation Types</FONT>&nbsp;
+<FONT CLASS="FrameItemFont">
+<BR>
+<A HREF="Inject.html" title="annotation in javax.inject" target="classFrame">Inject</A>
+<BR>
+<A HREF="Named.html" title="annotation in javax.inject" target="classFrame">Named</A>
+<BR>
+<A HREF="Qualifier.html" title="annotation in javax.inject" target="classFrame">Qualifier</A>
+<BR>
+<A HREF="Scope.html" title="annotation in javax.inject" target="classFrame">Scope</A>
+<BR>
+<A HREF="Singleton.html" title="annotation in javax.inject" target="classFrame">Singleton</A></FONT></TD>
+</TR>
+</TABLE>
+
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/package-summary.html b/javadoc/javax/inject/package-summary.html
new file mode 100644
index 0000000..a028de8
--- /dev/null
+++ b/javadoc/javax/inject/package-summary.html
@@ -0,0 +1,209 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+javax.inject
+</TITLE>
+
+<META NAME="keywords" CONTENT="javax.inject package">
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="javax.inject";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV PACKAGE&nbsp;
+&nbsp;NEXT PACKAGE</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<H2>
+Package javax.inject
+</H2>
+Provides annotations for dependency injection.
+<P>
+<B>See:</B>
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Interface Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../javax/inject/Provider.html" title="interface in javax.inject">Provider&lt;T&gt;</A></B></TD>
+<TD>Provides instances of <code>T</code>.</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+
+<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
+<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
+<B>Annotation Types Summary</B></FONT></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../javax/inject/Inject.html" title="annotation in javax.inject">Inject</A></B></TD>
+<TD>Identifies injectable constructors, methods, and fields.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../javax/inject/Named.html" title="annotation in javax.inject">Named</A></B></TD>
+<TD>String-based <A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject">qualifier</A>.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject">Qualifier</A></B></TD>
+<TD>Identifies qualifier annotations.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject">Scope</A></B></TD>
+<TD>Identifies scope annotations.</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject">Singleton</A></B></TD>
+<TD>Identifies a type that the injector only instantiates once.</TD>
+</TR>
+</TABLE>
+&nbsp;
+
+<P>
+<A NAME="package_description"><!-- --></A><H2>
+Package javax.inject Description
+</H2>
+
+<P>
+Provides annotations for dependency injection. Enables portable objects
+ but leaves external dependency configuration up to <i>the injector</i>
+ implementation.
+
+ <p>For the purposes of this specification, the injector is anything that
+ injects objects. Injector implementations can take many forms. An injector
+ could rely on code generation or reflection. An injector could configure
+ itself using XML, annotations, a DSL (domain-specific language), or even
+ plain Java code. A "container", for some definition, can be an injector,
+ but this specification aims to minimize restrictions on injector
+ implementations.
+
+ <p>For example, an injector that uses compile time code generation may not
+ even have its own run time representation. Other injectors may not be able
+ to generate code at all, neither at compile nor run time.
+<P>
+
+<P>
+<DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Inject.html" title="annotation in javax.inject"><CODE>@Inject</CODE></A></DL>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV PACKAGE&nbsp;
+&nbsp;NEXT PACKAGE</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/javax/inject/package-tree.html b/javadoc/javax/inject/package-tree.html
new file mode 100644
index 0000000..dd2ef34
--- /dev/null
+++ b/javadoc/javax/inject/package-tree.html
@@ -0,0 +1,150 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--NewPage-->
+<HTML>
+<HEAD>
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
+<TITLE>
+javax.inject Class Hierarchy
+</TITLE>
+
+
+<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
+
+<SCRIPT type="text/javascript">
+function windowTitle()
+{
+    parent.document.title="javax.inject Class Hierarchy";
+}
+</SCRIPT>
+<NOSCRIPT>
+</NOSCRIPT>
+
+</HEAD>
+
+<BODY BGCOLOR="white" onload="windowTitle();">
+
+
+<!-- ========= START OF TOP NAVBAR ======= -->
+<A NAME="navbar_top"><!-- --></A>
+<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_top_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_top"></A>
+<!-- ========= END OF TOP NAVBAR ========= -->
+
+<HR>
+<CENTER>
+<H2>
+Hierarchy For Package javax.inject
+</H2>
+</CENTER>
+<H2>
+Interface Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">javax.inject.<A HREF="../../javax/inject/Provider.html" title="interface in javax.inject"><B>Provider</B></A>&lt;T&gt;</UL>
+<H2>
+Annotation Type Hierarchy
+</H2>
+<UL>
+<LI TYPE="circle">javax.inject.<A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject"><B>Singleton</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><B>Scope</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject"><B>Qualifier</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><B>Named</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="../../javax/inject/Inject.html" title="annotation in javax.inject"><B>Inject</B></A> (implements java.lang.annotation.Annotation)
+</UL>
+<HR>
+
+
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<A NAME="navbar_bottom"><!-- --></A>
+<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
+<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
+<TR>
+<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
+<A NAME="navbar_bottom_firstrow"><!-- --></A>
+<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
+  <TR ALIGN="center" VALIGN="top">
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
+  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
+  </TR>
+</TABLE>
+</TD>
+<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
+</TD>
+</TR>
+
+<TR>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+&nbsp;PREV&nbsp;
+&nbsp;NEXT</FONT></TD>
+<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
+  <A HREF="../../index.html?javax/inject/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
+&nbsp;<SCRIPT type="text/javascript">
+  <!--
+  if(window==top) {
+    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
+  }
+  //-->
+</SCRIPT>
+<NOSCRIPT>
+  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
+</NOSCRIPT>
+
+
+</FONT></TD>
+</TR>
+</TABLE>
+<A NAME="skip-navbar_bottom"></A>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+
+<HR>
+
+</BODY>
+</HTML>
diff --git a/javadoc/org/atinject/Inject.html b/javadoc/org/atinject/Inject.html
deleted file mode 100644
index b356f03..0000000
--- a/javadoc/org/atinject/Inject.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-Inject
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject.Inject class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Inject";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Inject.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Inject.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.atinject</FONT>
-<BR>
-Annotation Type Inject</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Target(value={METHOD,CONSTRUCTOR,FIELD})
-@Retention(value=RUNTIME)
-@Documented
-</FONT>public @interface <B>Inject</B></DL>
-</PRE>
-
-<P>
-Identifies injectable constructors, methods, and fields. Applies to static
- as well as instance members. An injectable member may have any access
- modifier (private, package-private, protected, public). Constructors are
- injected first, followed by fields, and then methods. Fields and methods
- in superclasses are injected before those in subclasses. Ordering of
- injection among fields and among methods in the same class is not specified.
- Which values are injected depends upon the injector implementation and its
- configuration.
- 
- <p>Injectable constructors are annotated with <code>@Inject</code> and accept
- zero or more dependencies as arguments. <code>@Inject</code> can apply to at most
- one constructor per class.
-
- <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
-       <i>ConstructorModifiers<sub>opt</sub></i>
-       <i>SimpleTypeName</i>(<i>FormalParameterList<sub>opt</sub></i>)
-       <i>Throws<sub>opt</sub></i>
-       <i>ConstructorBody</i></blockquote></tt>
-
- <p><code>@Inject</code> is optional for public, no-argument constructors when no
- other constructors are present. This enables injectors to invoke default
- constructors.
-
- <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">
-       @Inject<sub><i>opt</i></sub>
-       <i>Annotations<sub>opt</sub></i>
-       public
-       <i>SimpleTypeName</i>()
-       <i>Throws<sub>opt</sub></i>
-       <i>ConstructorBody</i></blockquote></tt>
-
- <p>Injectable fields:
- <ul>
-   <li>are annotated with <code>@Inject</code>.
-   <li>are not final.
-   <li>may have any otherwise valid name.</li></ul>
-
- <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
-       <i>FieldModifiers<sub>opt</sub></i>
-       <i>Type</i>
-       <i>VariableDeclarators</i>;</blockquote></tt>
-
- <p>Injectable methods:
- <ul>
-   <li>are annotated with <code>@Inject</code>.</li>
-   <li>are not abstract.</li>
-   <li>do not declare type parameters of their own.</li>
-   <li>return <code>void</code>.</li>
-   <li>may have any otherwise valid name.</li>
-   <li>accept zero or more dependencies as arguments.</li></ul>
-
- <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
-       <i>MethodModifiers<sub>opt</sub></i>
-       void
-       <i>Identifier</i>(<i>FormalParameterList<sub>opt</sub></i>)
-       <i>Throws<sub>opt</sub></i>
-       <i>MethodBody</i></blockquote></tt>
-
- <p>For example:
-
- <pre>
-   public class Car {
-     // Injectable constructor
-     &#064;Inject public Car(Engine engine) { ... }
-
-     // Injectable field
-     &#064;Inject private Provider&lt;Seat> seatProvider;
-
-     // Injectable package-private method
-     &#064;Inject void install(Windshield windshield, Trunk trunk) { ... }
-   }</pre>
-
- <p>A method annotated with <code>@Inject</code> that overrides another method
- annotated with <code>@Inject</code> will only be injected once per injection
- request per instance. A method with <i>no</i> <code>@Inject</code> annotation
- that overrides a method annotated with <code>@Inject</code> will not be
- injected.
-
- <p>Injection of members annotated with <code>@Inject</code> is required by
- default. This behavior can be overridden by setting <A HREF="../../org/atinject/Inject.html#optional()"><CODE>optional</CODE></A> equal to <code>true</code>.
-
- <p>Detecting and resolving circular dependencies is left as an exercize for
- the injector implementation. Circular dependencies between two constructors
- is an obvious problem, but you can also have a circular dependency between
- injectable fields or methods:
-
- <pre>
-   class A {
-     &#064;Inject B b;
-   }
-   class B {
-     &#064;Inject A a;
-   }</pre>
-
- <p>When constructing an instance of <code>A</code>, a naive injector
- implementation might go into an infinite loop constructing an instance of
- <code>B</code> to set on <code>A</code>, a second instance of <code>A</code> to set on
- <code>B</code>, a second instance of <code>B</code> to set on the second instance of
- <code>A</code>, and so on.
-
- <p>A conservative injector might detect the circular dependency at build
- time and generate an error, at which point the programmer could break the
- circular dependency by injecting <A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><CODE>Provider&lt;A></CODE></A> or <code>Provider&lt;B&gt;</code> instead of <code>A</code> or <code>B</code> respectively. Calling <A HREF="../../org/atinject/Provider.html#get()"><CODE>get()</CODE></A> on the provider directly from the constructor or
- method it was injected into defeats the provider's ability to break up
- circular dependencies. In the case of method or field injection, scoping
- one of the dependencies (using <A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject">singleton scope</A>, for
- example) may also enable a valid circular relationship.
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject"><CODE>@Qualifier</CODE></A>, 
-<A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><CODE>Provider</CODE></A></DL>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_optional_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Optional Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../org/atinject/Inject.html#optional()">optional</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Whether or not injection is optional.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="optional()"><!-- --></A><H3>
-optional</H3>
-<PRE>
-public abstract boolean <B>optional</B></PRE>
-<DL>
-<DD>Whether or not injection is optional. If <code>true</code>, the injector's
- behavior varies depending on the type of injection point:
-
- <p><ul>
-   <li><b>Constructors:</b> <i>Not allowed</i></li>
-   <li><b>Fields:</b> If a dependency matching the field can't
-     be found, the injector will not set the field.</li>
-   <li><b>Methods:</b> If a dependency matching a method parameter can't
-     be found, the injector will skip invoking the method entirely, even
-     if other arguments could be provided.</li>
- </ul>
- 
- <p>If an applicable dependency has been configured but the injector
- encounters an error while resolving the dependency (a transitive
- dependency could be missing, for example), the injector should generate
- an error, not skip the injection. For example:
-
- <pre>
-   &#064;Inject(optional=true) Gps gps;</pre>
-
- <p>If a Gps isn't available at all, the injector will simply not set the
- <code>gps</code> field. If a Gps is available but an algorithm it depends
- upon can't be found, the injector will generate an error.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-<DL>
-<DT><B>Default:</B><DD>false</DD>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Inject.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Inject.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;<A HREF="#annotation_type_optional_element_summary">OPTIONAL</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/Named.html b/javadoc/org/atinject/Named.html
deleted file mode 100644
index 18fbee0..0000000
--- a/javadoc/org/atinject/Named.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-Named
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject.Named class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Named";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Inject.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Named.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Named.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.atinject</FONT>
-<BR>
-Annotation Type Named</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1"><A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject">@Qualifier</A>
-@Documented
-@Retention(value=RUNTIME)
-</FONT>public @interface <B>Named</B></DL>
-</PRE>
-
-<P>
-String-based <A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject">qualifier</A>.
-<P>
-
-<P>
-<HR>
-
-<P>
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-
-<A NAME="annotation_type_required_element_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Required Element Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../org/atinject/Named.html#value()">value</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;The name.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-
-<A NAME="annotation_type_element_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Element Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="value()"><!-- --></A><H3>
-value</H3>
-<PRE>
-public abstract java.lang.String <B>value</B></PRE>
-<DL>
-<DD>The name.
-<P>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Inject.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Named.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Named.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;<A HREF="#annotation_type_required_element_summary">REQUIRED</A>&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#annotation_type_element_detail">ELEMENT</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/Provider.html b/javadoc/org/atinject/Provider.html
deleted file mode 100644
index e766235..0000000
--- a/javadoc/org/atinject/Provider.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-Provider
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject.Provider interface">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Provider";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Provider.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Provider.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.atinject</FONT>
-<BR>
-Interface Provider&lt;T&gt;</H2>
-<HR>
-<DL>
-<DT><PRE>public interface <B>Provider&lt;T&gt;</B></DL>
-</PRE>
-
-<P>
-Provides instances of <code>T</code>. For any type <code>T</code> that can be
- injected, you can also inject <code>Provider&lt;T&gt;</code>. Compared to injecting
- <code>T</code> directly, injecting <code>Provider&lt;T&gt;</code> enables:
-
- <ul>
-   <li>retrieving multiple instances.</li>
-   <li>lazy or optional retrieval of an instance.</li>
-   <li>breaking circular dependencies.</li>
-   <li>abstracting scope so you can look up an instance in a smaller scope
-      from an instance in a containing scope.</li>
- </ul>
-
- <p>For example:
-
- <pre>
-   class Car {
-     &#064;Inject Car(Provider&lt;Seat> seatProvider) {
-       Seat driver = seatProvider.get();
-       Seat passenger = seatProvider.get();
-       ...
-     }
-   }</pre>
-<P>
-
-<P>
-<HR>
-
-<P>
-
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../org/atinject/Provider.html" title="type parameter in Provider">T</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../org/atinject/Provider.html#get()">get</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Provides an instance of <code>T</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="1"><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TH>
-</TR>
-</TABLE>
-
-<A NAME="get()"><!-- --></A><H3>
-get</H3>
-<PRE>
-<A HREF="../../org/atinject/Provider.html" title="type parameter in Provider">T</A> <B>get</B>()</PRE>
-<DL>
-<DD>Provides an instance of <code>T</code>.
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Provider.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Provider.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;CONSTR&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/Qualifier.html b/javadoc/org/atinject/Qualifier.html
deleted file mode 100644
index 2e7a7c8..0000000
--- a/javadoc/org/atinject/Qualifier.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-Qualifier
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject.Qualifier class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Qualifier";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Qualifier.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Qualifier.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.atinject</FONT>
-<BR>
-Annotation Type Qualifier</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Target(value=ANNOTATION_TYPE)
-@Retention(value=RUNTIME)
-@Documented
-</FONT>public @interface <B>Qualifier</B></DL>
-</PRE>
-
-<P>
-Identifies qualifier annotations. A qualifier annotates an injectable field
- or parameter and, combined with the type, identifies the implementation to
- inject. Qualifiers are optional and no more than one should annotate a
- single field or parameter. The qualifiers are bold in the following
- example:
-
- <pre>
-   public class Car {
-     &#064;Inject private <b>@Leather</b> Provider&lt;Seat> seatProvider;
-
-     &#064;Inject void install(<b>@Tinted</b> Windshield windshield,
-         <b>@Big</b> Trunk trunk) { ... }
-   }</pre>
-
- <p>If one injectable method overrides another, the overriding method's
- parameters do not automatically inherit qualifiers from the overridden
- method's parameters.
-
- <p>Anyone can define a new qualifier. A qualifier annotation:
- <ul>
-   <li>is annotated with <code>@Qualifier</code>, <code>@Retention(RUNTIME)</code>,
-      and typically <code>@Documented</code>.</li>
-   <li>can have attributes.</li>
-   <li>is <i>not</i> annotated with <code>@Target</code>. While this
-      specification only covers applying qualifiers to fields and parameters,
-      some injector configurations might use qualifier annotations in other
-      places (on methods or classes for example).</li>
-   <li>may be part of the public API, much like the dependency type, but
-      unlike implementation types which needn't be part of the public
-      API.</li>
- </ul>
-
- <p>For example:
-
- <pre>
-   &#064;org.atinject.Qualifier
-   &#064;java.lang.annotation.Documented
-   &#064;java.lang.annotation.Retention(RUNTIME)
-   public @interface Leather {
-     Color color() default Color.TAN;
-     public enum Color { RED, BLACK, TAN }
-   }</pre>
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><CODE>@Named</CODE></A></DL>
-
-<P>
-
-<P>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Qualifier.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Qualifier.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/Scope.html b/javadoc/org/atinject/Scope.html
deleted file mode 100644
index cc3dcb3..0000000
--- a/javadoc/org/atinject/Scope.html
+++ /dev/null
@@ -1,215 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-Scope
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject.Scope class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Scope";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Scope.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Scope.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.atinject</FONT>
-<BR>
-Annotation Type Scope</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1">@Target(value=ANNOTATION_TYPE)
-@Retention(value=RUNTIME)
-@Documented
-</FONT>public @interface <B>Scope</B></DL>
-</PRE>
-
-<P>
-Identifies scope annotations. A scope annotation applies to a class
- containing an injectable constructor and governs how the injector reuses
- instances of the type. By default, if no scope annotation is present, the
- injector creates an instance (by injecting the type's constructor), uses
- the instance for one injection, and then forgets it. If a scope annotation
- is present, the injector may retain the instance for possible reuse in a
- later injection. If multiple threads can access a scoped instance, its
- implementation should be thread safe. The implementation of the scope
- itself is left up to the injector.
-
- <p>In the following example, the scope annotation <code>@Singleton</code> ensures
- that we only have one Log instance:
-
- <pre>
-   &#064;Singleton
-   class Log {
-     void log(String message) { ... }
-   }</pre>
- 
- <p>The injector generates an error if it encounters more than one scope
- annotation on the same class or a scope annotation it doesn't support.
-
- <p>A scope annotation:
- <ul>
-   <li>is annotated with <code>@Scope</code>, <code>@Retention(RUNTIME)</code>,
-      and typically <code>@Documented</code>.</li>
-   <li>should not have attributes.</li>
-   <li>is typically not <code>@Inherited</code>, so scoping is orthogonal to
-      implementation inheritance.</li>
-   <li>is <i>not</i> annotated with <code>@Target</code>. While this
-      specification only covers applying scopes to classes, some injector
-      configurations might use scopes in other places (on factory
-      method results for example).</li>
- </ul>
-
- <p>For example:
-
- <pre>
-   &#064;Scope
-   &#064;Documented
-   &#064;Retention(RUNTIME)
-   public @interface RequestScoped {}</pre>
-
- <p>Annotating scope annotations with <code>@Scope</code> helps the injector
- detect the case where a programmer used the scope annotation on a class but
- forgot to configure the scope in the injector. A conservative injector
- would generate an error rather than not apply a scope.
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject"><CODE>@Singleton</CODE></A></DL>
-
-<P>
-
-<P>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Scope.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Scope.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/Singleton.html b/javadoc/org/atinject/Singleton.html
deleted file mode 100644
index 3015304..0000000
--- a/javadoc/org/atinject/Singleton.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-Singleton
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject.Singleton class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Singleton";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Singleton.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Singleton.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.atinject</FONT>
-<BR>
-Annotation Type Singleton</H2>
-<HR>
-<DL>
-<DT><PRE><FONT SIZE="-1"><A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject">@Scope</A>
-@Documented
-@Retention(value=RUNTIME)
-</FONT>public @interface <B>Singleton</B></DL>
-</PRE>
-
-<P>
-Identifies a type that the injector only instantiates once. Not inherited.
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><CODE>@Scope</CODE></A></DL>
-
-<P>
-
-<P>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/Singleton.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="Singleton.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;REQUIRED&nbsp;|&nbsp;OPTIONAL</FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;ELEMENT</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/package-frame.html b/javadoc/org/atinject/package-frame.html
deleted file mode 100644
index 8f375bd..0000000
--- a/javadoc/org/atinject/package-frame.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-org.atinject
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../org/atinject/package-summary.html" target="classFrame">org.atinject</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Interfaces</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Provider.html" title="interface in org.atinject" target="classFrame"><I>Provider</I></A></FONT></TD>
-</TR>
-</TABLE>
-
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Annotation Types</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="Inject.html" title="annotation in org.atinject" target="classFrame">Inject</A>
-<BR>
-<A HREF="Named.html" title="annotation in org.atinject" target="classFrame">Named</A>
-<BR>
-<A HREF="Qualifier.html" title="annotation in org.atinject" target="classFrame">Qualifier</A>
-<BR>
-<A HREF="Scope.html" title="annotation in org.atinject" target="classFrame">Scope</A>
-<BR>
-<A HREF="Singleton.html" title="annotation in org.atinject" target="classFrame">Singleton</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/package-summary.html b/javadoc/org/atinject/package-summary.html
deleted file mode 100644
index 5d79f12..0000000
--- a/javadoc/org/atinject/package-summary.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-org.atinject
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.atinject package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="org.atinject";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package org.atinject
-</H2>
-Provides annotations for dependency injection.
-<P>
-<B>See:</B>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="#package_description"><B>Description</B></A>
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Interface Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../org/atinject/Provider.html" title="interface in org.atinject">Provider&lt;T&gt;</A></B></TD>
-<TD>Provides instances of <code>T</code>.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TH ALIGN="left" COLSPAN="2"><FONT SIZE="+2">
-<B>Annotation Types Summary</B></FONT></TH>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../org/atinject/Inject.html" title="annotation in org.atinject">Inject</A></B></TD>
-<TD>Identifies injectable constructors, methods, and fields.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../org/atinject/Named.html" title="annotation in org.atinject">Named</A></B></TD>
-<TD>String-based <A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject">qualifier</A>.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject">Qualifier</A></B></TD>
-<TD>Identifies qualifier annotations.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject">Scope</A></B></TD>
-<TD>Identifies scope annotations.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject">Singleton</A></B></TD>
-<TD>Identifies a type that the injector only instantiates once.</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<A NAME="package_description"><!-- --></A><H2>
-Package org.atinject Description
-</H2>
-
-<P>
-Provides annotations for dependency injection. Enables portable objects but
- leaves external dependency configuration up to <i>the injector</i>
- implementation. For the purposes of this specification, the injector is
- anything that injects objects. Injector implementations can take many
- forms. An injector could rely on code generation or reflection. An injector
- could configure itself using XML, annotations, a DSL (domain-specific
- language), or even plain Java code. A "container", for some definition, can
- be an injector, but this specification aims to minimize restrictions on
- injector implementations. For example, an injector that uses compile time
- code generation may not even have its own run time representation. Other
- injectors may not be able to generate code at all, neither at compile nor
- run time.
-<P>
-
-<P>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Inject.html" title="annotation in org.atinject"><CODE>@Inject</CODE></A></DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/org/atinject/package-tree.html b/javadoc/org/atinject/package-tree.html
deleted file mode 100644
index 2d69936..0000000
--- a/javadoc/org/atinject/package-tree.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
-<TITLE>
-org.atinject Class Hierarchy
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="org.atinject Class Hierarchy";
-}
-</SCRIPT>
-<NOSCRIPT>
-</NOSCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package org.atinject
-</H2>
-</CENTER>
-<H2>
-Interface Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">org.atinject.<A HREF="../../org/atinject/Provider.html" title="interface in org.atinject"><B>Provider</B></A>&lt;T&gt;</UL>
-<H2>
-Annotation Type Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">org.atinject.<A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject"><B>Singleton</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><B>Scope</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="../../org/atinject/Qualifier.html" title="annotation in org.atinject"><B>Qualifier</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><B>Named</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="../../org/atinject/Inject.html" title="annotation in org.atinject"><B>Inject</B></A> (implements java.lang.annotation.Annotation)
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=2 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../index.html?org/atinject/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index 9e51b15..7aa5a55 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_16) on Sat Apr 04 14:00:41 PDT 2009 -->
+<!-- Generated by javadoc (build 1.5.0_13) on Tue Apr 28 17:34:50 PDT 2009 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
@@ -33,7 +33,7 @@ function windowTitle()
 <A NAME="navbar_top_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -43,7 +43,7 @@ function windowTitle()
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
@@ -78,22 +78,22 @@ function windowTitle()
 Hierarchy For All Packages</H2>
 </CENTER>
 <DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="org/atinject/package-tree.html">org.atinject</A></DL>
+<DT><B>Package Hierarchies:</B><DD><A HREF="javax/inject/package-tree.html">javax.inject</A></DL>
 <HR>
 <H2>
 Interface Hierarchy
 </H2>
 <UL>
-<LI TYPE="circle">org.atinject.<A HREF="org/atinject/Provider.html" title="interface in org.atinject"><B>Provider</B></A>&lt;T&gt;</UL>
+<LI TYPE="circle">javax.inject.<A HREF="javax/inject/Provider.html" title="interface in javax.inject"><B>Provider</B></A>&lt;T&gt;</UL>
 <H2>
 Annotation Type Hierarchy
 </H2>
 <UL>
-<LI TYPE="circle">org.atinject.<A HREF="org/atinject/Singleton.html" title="annotation in org.atinject"><B>Singleton</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="org/atinject/Scope.html" title="annotation in org.atinject"><B>Scope</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="org/atinject/Qualifier.html" title="annotation in org.atinject"><B>Qualifier</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="org/atinject/Named.html" title="annotation in org.atinject"><B>Named</B></A> (implements java.lang.annotation.Annotation)
-<LI TYPE="circle">org.atinject.<A HREF="org/atinject/Inject.html" title="annotation in org.atinject"><B>Inject</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="javax/inject/Singleton.html" title="annotation in javax.inject"><B>Singleton</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="javax/inject/Scope.html" title="annotation in javax.inject"><B>Scope</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="javax/inject/Qualifier.html" title="annotation in javax.inject"><B>Qualifier</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="javax/inject/Named.html" title="annotation in javax.inject"><B>Named</B></A> (implements java.lang.annotation.Annotation)
+<LI TYPE="circle">javax.inject.<A HREF="javax/inject/Inject.html" title="annotation in javax.inject"><B>Inject</B></A> (implements java.lang.annotation.Annotation)
 </UL>
 <HR>
 
@@ -107,7 +107,7 @@ Annotation Type Hierarchy
 <A NAME="navbar_bottom_firstrow"><!-- --></A>
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
   <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="org/atinject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
+  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="javax/inject/package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
   <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
   <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
@@ -117,7 +117,7 @@ Annotation Type Hierarchy
 </TABLE>
 </TD>
 <TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
+<font color='red'><b>This is a DRAFT specification.</b></font></EM>
 </TD>
 </TR>
 
diff --git a/javadoc/package-list b/javadoc/package-list
index 87091fc..98a4cde 100644
--- a/javadoc/package-list
+++ b/javadoc/package-list
@@ -1 +1 @@
-org.atinject
+javax.inject
diff --git a/src/javax/inject/Inject.java b/src/javax/inject/Inject.java
new file mode 100644
index 0000000..1509d21
--- /dev/null
+++ b/src/javax/inject/Inject.java
@@ -0,0 +1,157 @@
+package javax.inject;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+
+/**
+ * Identifies injectable constructors, methods, and fields. Applies to static
+ * as well as instance members. An injectable member may have any access
+ * modifier (private, package-private, protected, public). Constructors are
+ * injected first, followed by fields, and then methods. Fields and methods
+ * in superclasses are injected before those in subclasses. Ordering of
+ * injection among fields and among methods in the same class is not specified.
+ * Which values are injected depends upon the injector implementation and its
+ * configuration.
+ * 
+ * <p>Injectable constructors are annotated with {@code @Inject} and accept
+ * zero or more dependencies as arguments. {@code @Inject} can apply to at most
+ * one constructor per class.
+ *
+ * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
+ *       <i>ConstructorModifiers<sub>opt</sub></i>
+ *       <i>SimpleTypeName</i>(<i>FormalParameterList<sub>opt</sub></i>)
+ *       <i>Throws<sub>opt</sub></i>
+ *       <i>ConstructorBody</i></blockquote></tt>
+ *
+ * <p>{@code @Inject} is optional for public, no-argument constructors when no
+ * other constructors are present. This enables injectors to invoke default
+ * constructors.
+ *
+ * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">
+ *       {@literal @}Inject<sub><i>opt</i></sub>
+ *       <i>Annotations<sub>opt</sub></i>
+ *       public
+ *       <i>SimpleTypeName</i>()
+ *       <i>Throws<sub>opt</sub></i>
+ *       <i>ConstructorBody</i></blockquote></tt>
+ *
+ * <p>Injectable fields:
+ * <ul>
+ *   <li>are annotated with {@code @Inject}.
+ *   <li>are not final.
+ *   <li>may have any otherwise valid name.</li></ul>
+ *
+ * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
+ *       <i>FieldModifiers<sub>opt</sub></i>
+ *       <i>Type</i>
+ *       <i>VariableDeclarators</i>;</blockquote></tt>
+ *
+ * <p>Injectable methods:
+ * <ul>
+ *   <li>are annotated with {@code @Inject}.</li>
+ *   <li>are not abstract.</li>
+ *   <li>do not declare type parameters of their own.</li>
+ *   <li>return {@code void}.</li>
+ *   <li>may have any otherwise valid name.</li>
+ *   <li>accept zero or more dependencies as arguments.</li></ul>
+ *
+ * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
+ *       <i>MethodModifiers<sub>opt</sub></i>
+ *       void
+ *       <i>Identifier</i>(<i>FormalParameterList<sub>opt</sub></i>)
+ *       <i>Throws<sub>opt</sub></i>
+ *       <i>MethodBody</i></blockquote></tt>
+ *
+ * <p>For example:
+ *
+ * <pre>
+ *   public class Car {
+ *     // Injectable constructor
+ *     &#064;Inject public Car(Engine engine) { ... }
+ *
+ *     // Injectable field
+ *     &#064;Inject private Provider&lt;Seat> seatProvider;
+ *
+ *     // Injectable package-private method
+ *     &#064;Inject void install(Windshield windshield, Trunk trunk) { ... }
+ *   }</pre>
+ *
+ * <p>A method annotated with {@code @Inject} that overrides another method
+ * annotated with {@code @Inject} will only be injected once per injection
+ * request per instance. A method with <i>no</i> {@code @Inject} annotation
+ * that overrides a method annotated with {@code @Inject} will not be
+ * injected.
+ *
+ * <p>Injection of members annotated with {@code @Inject} is required by
+ * default. This behavior can be overridden by setting {@link #optional()
+ * optional} equal to {@code true}.
+ *
+ * <p>Detecting and resolving circular dependencies is left as an exercize for
+ * the injector implementation. Circular dependencies between two constructors
+ * is an obvious problem, but you can also have a circular dependency between
+ * injectable fields or methods:
+ *
+ * <pre>
+ *   class A {
+ *     &#064;Inject B b;
+ *   }
+ *   class B {
+ *     &#064;Inject A a;
+ *   }</pre>
+ *
+ * <p>When constructing an instance of {@code A}, a naive injector
+ * implementation might go into an infinite loop constructing an instance of
+ * {@code B} to set on {@code A}, a second instance of {@code A} to set on
+ * {@code B}, a second instance of {@code B} to set on the second instance of
+ * {@code A}, and so on.
+ *
+ * <p>A conservative injector might detect the circular dependency at build
+ * time and generate an error, at which point the programmer could break the
+ * circular dependency by injecting {@link Provider Provider&lt;A>} or {@code
+ * Provider<B>} instead of {@code A} or {@code B} respectively. Calling {@link
+ * Provider#get() get()} on the provider directly from the constructor or
+ * method it was injected into defeats the provider's ability to break up
+ * circular dependencies. In the case of method or field injection, scoping
+ * one of the dependencies (using {@linkplain Singleton singleton scope}, for
+ * example) may also enable a valid circular relationship.
+ *
+ * @see javax.inject.Qualifier @Qualifier
+ * @see javax.inject.Provider
+ */
+@Target({ METHOD, CONSTRUCTOR, FIELD })
+@Retention(RUNTIME)
+@Documented
+public @interface Inject {
+
+    /**
+     * Whether or not injection is optional. If {@code true}, the injector's
+     * behavior varies depending on the type of injection point:
+     *
+     * <p><ul>
+     *   <li><b>Constructors:</b> <i>Not allowed</i></li>
+     *   <li><b>Fields:</b> If a dependency matching the field can't
+     *     be found, the injector will not set the field.</li>
+     *   <li><b>Methods:</b> If a dependency matching a method parameter can't
+     *     be found, the injector will skip invoking the method entirely, even
+     *     if other arguments could be provided.</li>
+     * </ul>
+     * 
+     * <p>If an applicable dependency has been configured but the injector
+     * encounters an error while resolving the dependency (a transitive
+     * dependency could be missing, for example), the injector should generate
+     * an error, not skip the injection. For example:
+     *
+     * <pre>
+     *   &#064;Inject(optional=true) Gps gps;</pre>
+     *
+     * <p>If a Gps isn't available at all, the injector will simply not set the
+     * {@code gps} field. If a Gps is available but an algorithm it depends
+     * upon can't be found, the injector will generate an error.
+     */
+    boolean optional() default false;
+}
diff --git a/src/javax/inject/Named.java b/src/javax/inject/Named.java
new file mode 100644
index 0000000..422748b
--- /dev/null
+++ b/src/javax/inject/Named.java
@@ -0,0 +1,17 @@
+package javax.inject;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * String-based {@linkplain Qualifier qualifier}.
+ */
+@Qualifier
+@Documented
+@Retention(RUNTIME)
+public @interface Named {
+
+    /** The name. */
+    String value();
+}
diff --git a/src/javax/inject/Provider.java b/src/javax/inject/Provider.java
new file mode 100644
index 0000000..ba1df61
--- /dev/null
+++ b/src/javax/inject/Provider.java
@@ -0,0 +1,36 @@
+package javax.inject;
+
+/**
+ * Provides instances of {@code T}. For any type {@code T} that can be
+ * injected, you can also inject {@code Provider<T>}. Compared to injecting
+ * {@code T} directly, injecting {@code Provider<T>} enables:
+ *
+ * <ul>
+ *   <li>retrieving multiple instances.</li>
+ *   <li>lazy or optional retrieval of an instance.</li>
+ *   <li>breaking circular dependencies.</li>
+ *   <li>abstracting scope so you can look up an instance in a smaller scope
+ *      from an instance in a containing scope.</li>
+ * </ul>
+ *
+ * <p>For example:
+ *
+ * <pre>
+ *   class Car {
+ *     &#064;Inject Car(Provider&lt;Seat> seatProvider) {
+ *       Seat driver = seatProvider.get();
+ *       Seat passenger = seatProvider.get();
+ *       ...
+ *     }
+ *   }</pre>
+ */
+public interface Provider<T> {
+
+    // TODO: Specify OutOfScopeException (or IllegalStateException) and
+    //  ProvisionException?
+
+    /**
+     * Provides an instance of {@code T}.
+     */
+    T get();
+}
diff --git a/src/javax/inject/Qualifier.java b/src/javax/inject/Qualifier.java
new file mode 100644
index 0000000..1eab6a7
--- /dev/null
+++ b/src/javax/inject/Qualifier.java
@@ -0,0 +1,58 @@
+package javax.inject;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * Identifies qualifier annotations. A qualifier annotates an injectable field
+ * or parameter and, combined with the type, identifies the implementation to
+ * inject. Qualifiers are optional and no more than one should annotate a
+ * single field or parameter. The qualifiers are bold in the following
+ * example:
+ *
+ * <pre>
+ *   public class Car {
+ *     &#064;Inject private <b>@Leather</b> Provider&lt;Seat> seatProvider;
+ *
+ *     &#064;Inject void install(<b>@Tinted</b> Windshield windshield,
+ *         <b>@Big</b> Trunk trunk) { ... }
+ *   }</pre>
+ *
+ * <p>If one injectable method overrides another, the overriding method's
+ * parameters do not automatically inherit qualifiers from the overridden
+ * method's parameters.
+ *
+ * <p>Anyone can define a new qualifier. A qualifier annotation:
+ * <ul>
+ *   <li>is annotated with {@code @Qualifier}, {@code @Retention(RUNTIME)},
+ *      and typically {@code @Documented}.</li>
+ *   <li>can have attributes.</li>
+ *   <li>is <i>not</i> annotated with {@code @Target}. While this
+ *      specification only covers applying qualifiers to fields and parameters,
+ *      some injector configurations might use qualifier annotations in other
+ *      places (on methods or classes for example).</li>
+ *   <li>may be part of the public API, much like the dependency type, but
+ *      unlike implementation types which needn't be part of the public
+ *      API.</li>
+ * </ul>
+ *
+ * <p>For example:
+ *
+ * <pre>
+ *   &#064;java.lang.annotation.Documented
+ *   &#064;java.lang.annotation.Retention(RUNTIME)
+ *   &#064;javax.inject.Qualifier
+ *   public @interface Leather {
+ *     Color color() default Color.TAN;
+ *     public enum Color { RED, BLACK, TAN }
+ *   }</pre>
+ *
+ * @see javax.inject.Named @Named
+ */
+@Target(ANNOTATION_TYPE)
+@Retention(RUNTIME)
+@Documented
+public @interface Qualifier {}
diff --git a/src/javax/inject/Scope.java b/src/javax/inject/Scope.java
new file mode 100644
index 0000000..7eb2666
--- /dev/null
+++ b/src/javax/inject/Scope.java
@@ -0,0 +1,63 @@
+package javax.inject;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+
+/**
+ * Identifies scope annotations. A scope annotation applies to a class
+ * containing an injectable constructor and governs how the injector reuses
+ * instances of the type. By default, if no scope annotation is present, the
+ * injector creates an instance (by injecting the type's constructor), uses
+ * the instance for one injection, and then forgets it. If a scope annotation
+ * is present, the injector may retain the instance for possible reuse in a
+ * later injection. If multiple threads can access a scoped instance, its
+ * implementation should be thread safe. The implementation of the scope
+ * itself is left up to the injector.
+ *
+ * <p>In the following example, the scope annotation {@code @Singleton} ensures
+ * that we only have one Log instance:
+ *
+ * <pre>
+ *   &#064;Singleton
+ *   class Log {
+ *     void log(String message) { ... }
+ *   }</pre>
+ * 
+ * <p>The injector generates an error if it encounters more than one scope
+ * annotation on the same class or a scope annotation it doesn't support.
+ *
+ * <p>A scope annotation:
+ * <ul>
+ *   <li>is annotated with {@code @Scope}, {@code @Retention(RUNTIME)},
+ *      and typically {@code @Documented}.</li>
+ *   <li>should not have attributes.</li>
+ *   <li>is typically not {@code @Inherited}, so scoping is orthogonal to
+ *      implementation inheritance.</li>
+ *   <li>is <i>not</i> annotated with {@code @Target}. While this
+ *      specification only covers applying scopes to classes, some injector
+ *      configurations might use scopes in other places (on factory
+ *      method results for example).</li>
+ * </ul>
+ *
+ * <p>For example:
+ *
+ * <pre>
+ *   &#064;java.lang.annotation.Documented
+ *   &#064;java.lang.annotation.Retention(RUNTIME)
+ *   &#064;javax.inject.Scope
+ *   public @interface RequestScoped {}</pre>
+ *
+ * <p>Annotating scope annotations with {@code @Scope} helps the injector
+ * detect the case where a programmer used the scope annotation on a class but
+ * forgot to configure the scope in the injector. A conservative injector
+ * would generate an error rather than not apply a scope.
+ *
+ * @see javax.inject.Singleton @Singleton
+ */
+@Target(ANNOTATION_TYPE)
+@Retention(RUNTIME)
+@Documented
+public @interface Scope {}
diff --git a/src/javax/inject/Singleton.java b/src/javax/inject/Singleton.java
new file mode 100644
index 0000000..bb83f0d
--- /dev/null
+++ b/src/javax/inject/Singleton.java
@@ -0,0 +1,15 @@
+package javax.inject;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Identifies a type that the injector only instantiates once. Not inherited.
+ *
+ * @see javax.inject.Scope @Scope
+ */
+@Scope
+@Documented
+@Retention(RUNTIME)
+public @interface Singleton {}
diff --git a/src/javax/inject/package-info.java b/src/javax/inject/package-info.java
new file mode 100644
index 0000000..77ea903
--- /dev/null
+++ b/src/javax/inject/package-info.java
@@ -0,0 +1,23 @@
+// TODO: When generating Javadocs, include:
+//  -header "<font color='red'><b>This is a DRAFT specification.</b></font>"
+
+/**
+ * Provides annotations for dependency injection. Enables portable objects
+ * but leaves external dependency configuration up to <i>the injector</i>
+ * implementation.
+ *
+ * <p>For the purposes of this specification, the injector is anything that
+ * injects objects. Injector implementations can take many forms. An injector
+ * could rely on code generation or reflection. An injector could configure
+ * itself using XML, annotations, a DSL (domain-specific language), or even
+ * plain Java code. A "container", for some definition, can be an injector,
+ * but this specification aims to minimize restrictions on injector
+ * implementations.
+ *
+ * <p>For example, an injector that uses compile time code generation may not
+ * even have its own run time representation. Other injectors may not be able
+ * to generate code at all, neither at compile nor run time.
+ *
+ * @see javax.inject.Inject @Inject
+ */
+package javax.inject;
diff --git a/src/org/atinject/Inject.java b/src/org/atinject/Inject.java
deleted file mode 100644
index 74f1193..0000000
--- a/src/org/atinject/Inject.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.atinject;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-
-/**
- * Identifies injectable constructors, methods, and fields. Applies to static
- * as well as instance members. An injectable member may have any access
- * modifier (private, package-private, protected, public). Constructors are
- * injected first, followed by fields, and then methods. Fields and methods
- * in superclasses are injected before those in subclasses. Ordering of
- * injection among fields and among methods in the same class is not specified.
- * Which values are injected depends upon the injector implementation and its
- * configuration.
- * 
- * <p>Injectable constructors are annotated with {@code @Inject} and accept
- * zero or more dependencies as arguments. {@code @Inject} can apply to at most
- * one constructor per class.
- *
- * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
- *       <i>ConstructorModifiers<sub>opt</sub></i>
- *       <i>SimpleTypeName</i>(<i>FormalParameterList<sub>opt</sub></i>)
- *       <i>Throws<sub>opt</sub></i>
- *       <i>ConstructorBody</i></blockquote></tt>
- *
- * <p>{@code @Inject} is optional for public, no-argument constructors when no
- * other constructors are present. This enables injectors to invoke default
- * constructors.
- *
- * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">
- *       {@literal @}Inject<sub><i>opt</i></sub>
- *       <i>Annotations<sub>opt</sub></i>
- *       public
- *       <i>SimpleTypeName</i>()
- *       <i>Throws<sub>opt</sub></i>
- *       <i>ConstructorBody</i></blockquote></tt>
- *
- * <p>Injectable fields:
- * <ul>
- *   <li>are annotated with {@code @Inject}.
- *   <li>are not final.
- *   <li>may have any otherwise valid name.</li></ul>
- *
- * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
- *       <i>FieldModifiers<sub>opt</sub></i>
- *       <i>Type</i>
- *       <i>VariableDeclarators</i>;</blockquote></tt>
- *
- * <p>Injectable methods:
- * <ul>
- *   <li>are annotated with {@code @Inject}.</li>
- *   <li>are not abstract.</li>
- *   <li>do not declare type parameters of their own.</li>
- *   <li>return {@code void}.</li>
- *   <li>may have any otherwise valid name.</li>
- *   <li>accept zero or more dependencies as arguments.</li></ul>
- *
- * <p><tt><blockquote style="padding-left: 2em; text-indent: -2em;">@Inject
- *       <i>MethodModifiers<sub>opt</sub></i>
- *       void
- *       <i>Identifier</i>(<i>FormalParameterList<sub>opt</sub></i>)
- *       <i>Throws<sub>opt</sub></i>
- *       <i>MethodBody</i></blockquote></tt>
- *
- * <p>For example:
- *
- * <pre>
- *   public class Car {
- *     // Injectable constructor
- *     &#064;Inject public Car(Engine engine) { ... }
- *
- *     // Injectable field
- *     &#064;Inject private Provider&lt;Seat> seatProvider;
- *
- *     // Injectable package-private method
- *     &#064;Inject void install(Windshield windshield, Trunk trunk) { ... }
- *   }</pre>
- *
- * <p>A method annotated with {@code @Inject} that overrides another method
- * annotated with {@code @Inject} will only be injected once per injection
- * request per instance. A method with <i>no</i> {@code @Inject} annotation
- * that overrides a method annotated with {@code @Inject} will not be
- * injected.
- *
- * <p>Injection of members annotated with {@code @Inject} is required by
- * default. This behavior can be overridden by setting {@link #optional()
- * optional} equal to {@code true}.
- *
- * <p>Detecting and resolving circular dependencies is left as an exercize for
- * the injector implementation. Circular dependencies between two constructors
- * is an obvious problem, but you can also have a circular dependency between
- * injectable fields or methods:
- *
- * <pre>
- *   class A {
- *     &#064;Inject B b;
- *   }
- *   class B {
- *     &#064;Inject A a;
- *   }</pre>
- *
- * <p>When constructing an instance of {@code A}, a naive injector
- * implementation might go into an infinite loop constructing an instance of
- * {@code B} to set on {@code A}, a second instance of {@code A} to set on
- * {@code B}, a second instance of {@code B} to set on the second instance of
- * {@code A}, and so on.
- *
- * <p>A conservative injector might detect the circular dependency at build
- * time and generate an error, at which point the programmer could break the
- * circular dependency by injecting {@link Provider Provider&lt;A>} or {@code
- * Provider<B>} instead of {@code A} or {@code B} respectively. Calling {@link
- * Provider#get() get()} on the provider directly from the constructor or
- * method it was injected into defeats the provider's ability to break up
- * circular dependencies. In the case of method or field injection, scoping
- * one of the dependencies (using {@linkplain Singleton singleton scope}, for
- * example) may also enable a valid circular relationship.
- *
- * @see org.atinject.Qualifier @Qualifier
- * @see org.atinject.Provider
- */
-@Target({ METHOD, CONSTRUCTOR, FIELD })
-@Retention(RUNTIME)
-@Documented
-public @interface Inject {
-
-    /**
-     * Whether or not injection is optional. If {@code true}, the injector's
-     * behavior varies depending on the type of injection point:
-     *
-     * <p><ul>
-     *   <li><b>Constructors:</b> <i>Not allowed</i></li>
-     *   <li><b>Fields:</b> If a dependency matching the field can't
-     *     be found, the injector will not set the field.</li>
-     *   <li><b>Methods:</b> If a dependency matching a method parameter can't
-     *     be found, the injector will skip invoking the method entirely, even
-     *     if other arguments could be provided.</li>
-     * </ul>
-     * 
-     * <p>If an applicable dependency has been configured but the injector
-     * encounters an error while resolving the dependency (a transitive
-     * dependency could be missing, for example), the injector should generate
-     * an error, not skip the injection. For example:
-     *
-     * <pre>
-     *   &#064;Inject(optional=true) Gps gps;</pre>
-     *
-     * <p>If a Gps isn't available at all, the injector will simply not set the
-     * {@code gps} field. If a Gps is available but an algorithm it depends
-     * upon can't be found, the injector will generate an error.
-     */
-    boolean optional() default false;
-}
diff --git a/src/org/atinject/Named.java b/src/org/atinject/Named.java
deleted file mode 100644
index 4dc62d6..0000000
--- a/src/org/atinject/Named.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.atinject;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * String-based {@linkplain Qualifier qualifier}.
- */
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-public @interface Named {
-
-    /** The name. */
-    String value();
-}
diff --git a/src/org/atinject/Provider.java b/src/org/atinject/Provider.java
deleted file mode 100644
index 4de598e..0000000
--- a/src/org/atinject/Provider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.atinject;
-
-/**
- * Provides instances of {@code T}. For any type {@code T} that can be
- * injected, you can also inject {@code Provider<T>}. Compared to injecting
- * {@code T} directly, injecting {@code Provider<T>} enables:
- *
- * <ul>
- *   <li>retrieving multiple instances.</li>
- *   <li>lazy or optional retrieval of an instance.</li>
- *   <li>breaking circular dependencies.</li>
- *   <li>abstracting scope so you can look up an instance in a smaller scope
- *      from an instance in a containing scope.</li>
- * </ul>
- *
- * <p>For example:
- *
- * <pre>
- *   class Car {
- *     &#064;Inject Car(Provider&lt;Seat> seatProvider) {
- *       Seat driver = seatProvider.get();
- *       Seat passenger = seatProvider.get();
- *       ...
- *     }
- *   }</pre>
- */
-public interface Provider<T> {
-
-    // TODO: Specify OutOfScopeException (or IllegalStateException) and
-    //  ProvisionException?
-
-    /**
-     * Provides an instance of {@code T}.
-     */
-    T get();
-}
diff --git a/src/org/atinject/Qualifier.java b/src/org/atinject/Qualifier.java
deleted file mode 100644
index 235e3b4..0000000
--- a/src/org/atinject/Qualifier.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.atinject;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-
-/**
- * Identifies qualifier annotations. A qualifier annotates an injectable field
- * or parameter and, combined with the type, identifies the implementation to
- * inject. Qualifiers are optional and no more than one should annotate a
- * single field or parameter. The qualifiers are bold in the following
- * example:
- *
- * <pre>
- *   public class Car {
- *     &#064;Inject private <b>@Leather</b> Provider&lt;Seat> seatProvider;
- *
- *     &#064;Inject void install(<b>@Tinted</b> Windshield windshield,
- *         <b>@Big</b> Trunk trunk) { ... }
- *   }</pre>
- *
- * <p>If one injectable method overrides another, the overriding method's
- * parameters do not automatically inherit qualifiers from the overridden
- * method's parameters.
- *
- * <p>Anyone can define a new qualifier. A qualifier annotation:
- * <ul>
- *   <li>is annotated with {@code @Qualifier}, {@code @Retention(RUNTIME)},
- *      and typically {@code @Documented}.</li>
- *   <li>can have attributes.</li>
- *   <li>is <i>not</i> annotated with {@code @Target}. While this
- *      specification only covers applying qualifiers to fields and parameters,
- *      some injector configurations might use qualifier annotations in other
- *      places (on methods or classes for example).</li>
- *   <li>may be part of the public API, much like the dependency type, but
- *      unlike implementation types which needn't be part of the public
- *      API.</li>
- * </ul>
- *
- * <p>For example:
- *
- * <pre>
- *   &#064;org.atinject.Qualifier
- *   &#064;java.lang.annotation.Documented
- *   &#064;java.lang.annotation.Retention(RUNTIME)
- *   public @interface Leather {
- *     Color color() default Color.TAN;
- *     public enum Color { RED, BLACK, TAN }
- *   }</pre>
- *
- * @see org.atinject.Named @Named
- */
-@Target(ANNOTATION_TYPE)
-@Retention(RUNTIME)
-@Documented
-public @interface Qualifier {}
diff --git a/src/org/atinject/Scope.java b/src/org/atinject/Scope.java
deleted file mode 100644
index c5f5b8f..0000000
--- a/src/org/atinject/Scope.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.atinject;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
-
-/**
- * Identifies scope annotations. A scope annotation applies to a class
- * containing an injectable constructor and governs how the injector reuses
- * instances of the type. By default, if no scope annotation is present, the
- * injector creates an instance (by injecting the type's constructor), uses
- * the instance for one injection, and then forgets it. If a scope annotation
- * is present, the injector may retain the instance for possible reuse in a
- * later injection. If multiple threads can access a scoped instance, its
- * implementation should be thread safe. The implementation of the scope
- * itself is left up to the injector.
- *
- * <p>In the following example, the scope annotation {@code @Singleton} ensures
- * that we only have one Log instance:
- *
- * <pre>
- *   &#064;Singleton
- *   class Log {
- *     void log(String message) { ... }
- *   }</pre>
- * 
- * <p>The injector generates an error if it encounters more than one scope
- * annotation on the same class or a scope annotation it doesn't support.
- *
- * <p>A scope annotation:
- * <ul>
- *   <li>is annotated with {@code @Scope}, {@code @Retention(RUNTIME)},
- *      and typically {@code @Documented}.</li>
- *   <li>should not have attributes.</li>
- *   <li>is typically not {@code @Inherited}, so scoping is orthogonal to
- *      implementation inheritance.</li>
- *   <li>is <i>not</i> annotated with {@code @Target}. While this
- *      specification only covers applying scopes to classes, some injector
- *      configurations might use scopes in other places (on factory
- *      method results for example).</li>
- * </ul>
- *
- * <p>For example:
- *
- * <pre>
- *   &#064;Scope
- *   &#064;Documented
- *   &#064;Retention(RUNTIME)
- *   public @interface RequestScoped {}</pre>
- *
- * <p>Annotating scope annotations with {@code @Scope} helps the injector
- * detect the case where a programmer used the scope annotation on a class but
- * forgot to configure the scope in the injector. A conservative injector
- * would generate an error rather than not apply a scope.
- *
- * @see org.atinject.Singleton @Singleton
- */
-@Target(ANNOTATION_TYPE)
-@Retention(RUNTIME)
-@Documented
-public @interface Scope {}
diff --git a/src/org/atinject/Singleton.java b/src/org/atinject/Singleton.java
deleted file mode 100644
index 624a20c..0000000
--- a/src/org/atinject/Singleton.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.atinject;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Identifies a type that the injector only instantiates once. Not inherited.
- *
- * @see org.atinject.Scope @Scope
- */
-@Scope
-@Documented
-@Retention(RUNTIME)
-public @interface Singleton {}
diff --git a/src/org/atinject/package-info.java b/src/org/atinject/package-info.java
deleted file mode 100644
index a1b2b26..0000000
--- a/src/org/atinject/package-info.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Provides annotations for dependency injection. Enables portable objects but
- * leaves external dependency configuration up to <i>the injector</i>
- * implementation. For the purposes of this specification, the injector is
- * anything that injects objects. Injector implementations can take many
- * forms. An injector could rely on code generation or reflection. An injector
- * could configure itself using XML, annotations, a DSL (domain-specific
- * language), or even plain Java code. A "container", for some definition, can
- * be an injector, but this specification aims to minimize restrictions on
- * injector implementations. For example, an injector that uses compile time
- * code generation may not even have its own run time representation. Other
- * injectors may not be able to generate code at all, neither at compile nor
- * run time.
- *
- * @see org.atinject.Inject @Inject
- */
-package org.atinject;
-- 
cgit v1.2.3