Repackaged as javax.inject. git-svn-id: https://atinject.googlecode.com/svn/trunk@3 3bc8319c-20ab-11de-9edc-3f40a397ab60

commit: c92d8c3ee7684193bd85e3a3bc6c42273f2305ec [log] [tgz]
author: Bob Lee <crazybob@crazybob.org> Wed Apr 29 00:39:35 2009 +0000
committer: Bob Lee <crazybob@crazybob.org> Wed Apr 29 00:39:35 2009 +0000
tree: fdf09fbc9cc1fed446f38bc8fb88ec1aa00cfdf7
parent: 89db028e66ac03773d75c440fdaac667e2f63b83 [diff]
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 @@
 
 <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 @@
 
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="N-Index";
+    parent.document.title="J-Index";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -33,9 +33,9 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="O-Index";
+    parent.document.title="N-Index";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -33,9 +33,9 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 <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 @@
 </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 @@
 <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 @@
 </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 @@
 <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/org/atinject/Inject.html b/javadoc/javax/inject/Inject.html
similarity index 87%
rename from javadoc/org/atinject/Inject.html
rename to javadoc/javax/inject/Inject.html
index b356f03..17b52f8 100644
--- a/javadoc/org/atinject/Inject.html
+++ b/javadoc/javax/inject/Inject.html

@@ -2,12 +2,12 @@
 <!--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>
 Inject
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject.Inject class">
+<META NAME="keywords" CONTENT="javax.inject.Inject class">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
@@ -34,7 +34,7 @@
 <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="#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>
@@ -44,16 +44,16 @@
 </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>
 
 <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>
+&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?org/atinject/Inject.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--
@@ -83,7 +83,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.atinject</FONT>
+javax.inject</FONT>
 <BR>
 Annotation Type Inject</H2>
 <HR>
@@ -174,7 +174,7 @@
  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>.
+ 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
@@ -197,17 +197,17 @@
 
  <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
+ 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="../../org/atinject/Singleton.html" title="annotation in org.atinject">singleton scope</A>, for
+ 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="../../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>
+<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>
@@ -222,7 +222,7 @@
 <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>
+<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>
@@ -281,7 +281,7 @@
 <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="#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>
@@ -291,16 +291,16 @@
 </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>
 
 <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>
+&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?org/atinject/Inject.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--

diff --git a/javadoc/org/atinject/Named.html b/javadoc/javax/inject/Named.html
similarity index 81%
rename from javadoc/org/atinject/Named.html
rename to javadoc/javax/inject/Named.html
index 18fbee0..add733b 100644
--- a/javadoc/org/atinject/Named.html
+++ b/javadoc/javax/inject/Named.html

@@ -2,12 +2,12 @@
 <!--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>
 Named
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject.Named class">
+<META NAME="keywords" CONTENT="javax.inject.Named class">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
@@ -34,7 +34,7 @@
 <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="#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>
@@ -44,16 +44,16 @@
 </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>
 
 <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>
+&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?org/atinject/Named.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--
@@ -83,19 +83,19 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.atinject</FONT>
+javax.inject</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>
+<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="../../org/atinject/Qualifier.html" title="annotation in org.atinject">qualifier</A>.
+String-based <A HREF="../../javax/inject/Qualifier.html" title="annotation in javax.inject">qualifier</A>.
 <P>
 
 <P>
@@ -113,7 +113,7 @@
 <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>
+<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>
@@ -158,7 +158,7 @@
 <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="#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>
@@ -168,16 +168,16 @@
 </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>
 
 <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>
+&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?org/atinject/Named.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--

diff --git a/javadoc/org/atinject/Provider.html b/javadoc/javax/inject/Provider.html
similarity index 83%
rename from javadoc/org/atinject/Provider.html
rename to javadoc/javax/inject/Provider.html
index e766235..af72046 100644
--- a/javadoc/org/atinject/Provider.html
+++ b/javadoc/javax/inject/Provider.html

@@ -2,12 +2,12 @@
 <!--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>
 Provider
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject.Provider interface">
+<META NAME="keywords" CONTENT="javax.inject.Provider interface">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
@@ -34,7 +34,7 @@
 <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="#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>
@@ -44,16 +44,16 @@
 </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>
 
 <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>
+&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?org/atinject/Provider.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--
@@ -83,7 +83,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.atinject</FONT>
+javax.inject</FONT>
 <BR>
 Interface Provider&lt;T&gt;</H2>
 <HR>
@@ -131,8 +131,8 @@
 </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>
+<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>
@@ -154,7 +154,7 @@
 <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>
+<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>
@@ -175,7 +175,7 @@
 <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="#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>
@@ -185,16 +185,16 @@
 </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>
 
 <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>
+&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?org/atinject/Provider.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--

diff --git a/javadoc/org/atinject/Qualifier.html b/javadoc/javax/inject/Qualifier.html
similarity index 83%
rename from javadoc/org/atinject/Qualifier.html
rename to javadoc/javax/inject/Qualifier.html
index 2e7a7c8..5e20a25 100644
--- a/javadoc/org/atinject/Qualifier.html
+++ b/javadoc/javax/inject/Qualifier.html

@@ -2,12 +2,12 @@
 <!--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>
 Qualifier
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject.Qualifier class">
+<META NAME="keywords" CONTENT="javax.inject.Qualifier class">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
@@ -34,7 +34,7 @@
 <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="#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>
@@ -44,16 +44,16 @@
 </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>
 
 <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>
+&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?org/atinject/Qualifier.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--
@@ -83,7 +83,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.atinject</FONT>
+javax.inject</FONT>
 <BR>
 Annotation Type Qualifier</H2>
 <HR>
@@ -130,9 +130,9 @@
  <p>For example:
 
  <pre>
-   &#064;org.atinject.Qualifier
    &#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 }
@@ -141,7 +141,7 @@
 
 <P>
 <DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Named.html" title="annotation in org.atinject"><CODE>@Named</CODE></A></DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Named.html" title="annotation in javax.inject"><CODE>@Named</CODE></A></DL>
 
 <P>
 
@@ -159,7 +159,7 @@
 <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="#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>
@@ -169,16 +169,16 @@
 </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>
 
 <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>
+&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?org/atinject/Qualifier.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--

diff --git a/javadoc/org/atinject/Scope.html b/javadoc/javax/inject/Scope.html
similarity index 82%
rename from javadoc/org/atinject/Scope.html
rename to javadoc/javax/inject/Scope.html
index cc3dcb3..3df56a6 100644
--- a/javadoc/org/atinject/Scope.html
+++ b/javadoc/javax/inject/Scope.html

@@ -2,12 +2,12 @@
 <!--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>
 Scope
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject.Scope class">
+<META NAME="keywords" CONTENT="javax.inject.Scope class">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
@@ -34,7 +34,7 @@
 <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="#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>
@@ -44,16 +44,16 @@
 </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>
 
 <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>
+&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?org/atinject/Scope.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--
@@ -83,7 +83,7 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.atinject</FONT>
+javax.inject</FONT>
 <BR>
 Annotation Type Scope</H2>
 <HR>
@@ -133,9 +133,9 @@
  <p>For example:
 
  <pre>
-   &#064;Scope
-   &#064;Documented
-   &#064;Retention(RUNTIME)
+   &#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
@@ -146,7 +146,7 @@
 
 <P>
 <DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Singleton.html" title="annotation in org.atinject"><CODE>@Singleton</CODE></A></DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Singleton.html" title="annotation in javax.inject"><CODE>@Singleton</CODE></A></DL>
 
 <P>
 
@@ -164,7 +164,7 @@
 <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="#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>
@@ -174,16 +174,16 @@
 </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>
 
 <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>
+&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?org/atinject/Scope.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--

diff --git a/javadoc/org/atinject/Singleton.html b/javadoc/javax/inject/Singleton.html
similarity index 81%
rename from javadoc/org/atinject/Singleton.html
rename to javadoc/javax/inject/Singleton.html
index 3015304..f8bb89b 100644
--- a/javadoc/org/atinject/Singleton.html
+++ b/javadoc/javax/inject/Singleton.html

@@ -2,12 +2,12 @@
 <!--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>
 Singleton
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject.Singleton class">
+<META NAME="keywords" CONTENT="javax.inject.Singleton class">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../stylesheet.css" TITLE="Style">
 
@@ -34,7 +34,7 @@
 <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="#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>
@@ -44,16 +44,16 @@
 </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>
 
 <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;<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?org/atinject/Singleton.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--
@@ -83,12 +83,12 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <H2>
 <FONT SIZE="-1">
-org.atinject</FONT>
+javax.inject</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>
+<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>
@@ -100,7 +100,7 @@
 
 <P>
 <DL>
-<DT><B>See Also:</B><DD><A HREF="../../org/atinject/Scope.html" title="annotation in org.atinject"><CODE>@Scope</CODE></A></DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Scope.html" title="annotation in javax.inject"><CODE>@Scope</CODE></A></DL>
 
 <P>
 
@@ -118,7 +118,7 @@
 <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="#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>
@@ -128,16 +128,16 @@
 </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>
 
 <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;<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?org/atinject/Singleton.html" target="_top"><B>FRAMES</B></A>  &nbsp;
+  <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">
   <!--

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/org/atinject/package-summary.html b/javadoc/javax/inject/package-summary.html
similarity index 69%
rename from javadoc/org/atinject/package-summary.html
rename to javadoc/javax/inject/package-summary.html
index 5d79f12..a028de8 100644
--- a/javadoc/org/atinject/package-summary.html
+++ b/javadoc/javax/inject/package-summary.html

@@ -2,19 +2,19 @@
 <!--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>
-org.atinject
+javax.inject
 </TITLE>
 
-<META NAME="keywords" CONTENT="org.atinject package">
+<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="org.atinject";
+    parent.document.title="javax.inject";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -34,7 +34,7 @@
 <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="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>
@@ -44,7 +44,7 @@
 </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>
 
@@ -53,7 +53,7 @@
 &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;
+  <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">
   <!--
@@ -75,7 +75,7 @@
 
 <HR>
 <H2>
-Package org.atinject
+Package javax.inject
 </H2>
 Provides annotations for dependency injection.
 <P>
@@ -90,7 +90,7 @@
 <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 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>
@@ -104,23 +104,23 @@
 <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 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="../../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>
+<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="../../org/atinject/Qualifier.html" title="annotation in org.atinject">Qualifier</A></B></TD>
+<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="../../org/atinject/Scope.html" title="annotation in org.atinject">Scope</A></B></TD>
+<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="../../org/atinject/Singleton.html" title="annotation in org.atinject">Singleton</A></B></TD>
+<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>
@@ -128,27 +128,30 @@
 
 <P>
 <A NAME="package_description"><!-- --></A><H2>
-Package org.atinject Description
+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. 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.
+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="../../org/atinject/Inject.html" title="annotation in org.atinject"><CODE>@Inject</CODE></A></DL>
+<DT><B>See Also:</B><DD><A HREF="../../javax/inject/Inject.html" title="annotation in javax.inject"><CODE>@Inject</CODE></A></DL>
 <HR>
 
 
@@ -161,7 +164,7 @@
 <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="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>
@@ -171,7 +174,7 @@
 </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>
 
@@ -180,7 +183,7 @@
 &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;
+  <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">
   <!--

diff --git a/javadoc/org/atinject/package-tree.html b/javadoc/javax/inject/package-tree.html
similarity index 74%
rename from javadoc/org/atinject/package-tree.html
rename to javadoc/javax/inject/package-tree.html
index 2d69936..dd2ef34 100644
--- a/javadoc/org/atinject/package-tree.html
+++ b/javadoc/javax/inject/package-tree.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>
-org.atinject Class Hierarchy
+javax.inject Class Hierarchy
 </TITLE>
 
 
@@ -13,7 +13,7 @@
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="org.atinject Class Hierarchy";
+    parent.document.title="javax.inject Class Hierarchy";
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -33,7 +33,7 @@
 <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 @@
 </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>
 
@@ -52,7 +52,7 @@
 &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;
+  <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">
   <!--
@@ -75,23 +75,23 @@
 <HR>
 <CENTER>
 <H2>
-Hierarchy For Package org.atinject
+Hierarchy For Package javax.inject
 </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>
+<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>
 
@@ -105,7 +105,7 @@
 <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>
@@ -115,7 +115,7 @@
 </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>
 
@@ -124,7 +124,7 @@
 &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;
+  <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">
   <!--

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/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 @@
 <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 @@
 </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 @@
 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 @@
 <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 @@
 </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/org/atinject/Inject.java b/src/javax/inject/Inject.java
similarity index 98%
rename from src/org/atinject/Inject.java
rename to src/javax/inject/Inject.java
index 74f1193..1509d21 100644
--- a/src/org/atinject/Inject.java
+++ b/src/javax/inject/Inject.java

@@ -1,4 +1,4 @@
-package org.atinject;
+package javax.inject;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
@@ -120,8 +120,8 @@
  * 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
+ * @see javax.inject.Qualifier @Qualifier
+ * @see javax.inject.Provider
  */
 @Target({ METHOD, CONSTRUCTOR, FIELD })
 @Retention(RUNTIME)

diff --git a/src/org/atinject/Named.java b/src/javax/inject/Named.java
similarity index 93%
rename from src/org/atinject/Named.java
rename to src/javax/inject/Named.java
index 4dc62d6..422748b 100644
--- a/src/org/atinject/Named.java
+++ b/src/javax/inject/Named.java

@@ -1,4 +1,4 @@
-package org.atinject;
+package javax.inject;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Documented;

diff --git a/src/org/atinject/Provider.java b/src/javax/inject/Provider.java
similarity index 97%
rename from src/org/atinject/Provider.java
rename to src/javax/inject/Provider.java
index 4de598e..ba1df61 100644
--- a/src/org/atinject/Provider.java
+++ b/src/javax/inject/Provider.java

@@ -1,4 +1,4 @@
-package org.atinject;
+package javax.inject;
 
 /**
  * Provides instances of {@code T}. For any type {@code T} that can be

diff --git a/src/org/atinject/Qualifier.java b/src/javax/inject/Qualifier.java
similarity index 95%
rename from src/org/atinject/Qualifier.java
rename to src/javax/inject/Qualifier.java
index 235e3b4..1eab6a7 100644
--- a/src/org/atinject/Qualifier.java
+++ b/src/javax/inject/Qualifier.java

@@ -1,4 +1,4 @@
-package org.atinject;
+package javax.inject;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
@@ -42,15 +42,15 @@
  * <p>For example:
  *
  * <pre>
- *   &#064;org.atinject.Qualifier
  *   &#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 org.atinject.Named @Named
+ * @see javax.inject.Named @Named
  */
 @Target(ANNOTATION_TYPE)
 @Retention(RUNTIME)

diff --git a/src/org/atinject/Scope.java b/src/javax/inject/Scope.java
similarity index 92%
rename from src/org/atinject/Scope.java
rename to src/javax/inject/Scope.java
index c5f5b8f..7eb2666 100644
--- a/src/org/atinject/Scope.java
+++ b/src/javax/inject/Scope.java

@@ -1,4 +1,4 @@
-package org.atinject;
+package javax.inject;
 
 import java.lang.annotation.Target;
 import java.lang.annotation.Retention;
@@ -45,9 +45,9 @@
  * <p>For example:
  *
  * <pre>
- *   &#064;Scope
- *   &#064;Documented
- *   &#064;Retention(RUNTIME)
+ *   &#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
@@ -55,7 +55,7 @@
  * 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
+ * @see javax.inject.Singleton @Singleton
  */
 @Target(ANNOTATION_TYPE)
 @Retention(RUNTIME)

diff --git a/src/org/atinject/Singleton.java b/src/javax/inject/Singleton.java
similarity index 84%
rename from src/org/atinject/Singleton.java
rename to src/javax/inject/Singleton.java
index 624a20c..bb83f0d 100644
--- a/src/org/atinject/Singleton.java
+++ b/src/javax/inject/Singleton.java

@@ -1,4 +1,4 @@
-package org.atinject;
+package javax.inject;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -7,7 +7,7 @@
 /**
  * Identifies a type that the injector only instantiates once. Not inherited.
  *
- * @see org.atinject.Scope @Scope
+ * @see javax.inject.Scope @Scope
  */
 @Scope
 @Documented

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/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;
commit	c92d8c3ee7684193bd85e3a3bc6c42273f2305ec	[log] [tgz]
author	Bob Lee <crazybob@crazybob.org>	Wed Apr 29 00:39:35 2009 +0000
committer	Bob Lee <crazybob@crazybob.org>	Wed Apr 29 00:39:35 2009 +0000
tree	fdf09fbc9cc1fed446f38bc8fb88ec1aa00cfdf7
parent	89db028e66ac03773d75c440fdaac667e2f63b83 [diff]