Index: build.xml
===================================================================
--- build.xml	(revision 593961)
+++ build.xml	(working copy)
@@ -27,7 +27,6 @@
 
   <property name="demo.name" value="lucene-demos-${version}"/>
   <property name="demo.war.name" value="luceneweb"/>
-  <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
 
   <!-- Type of checksum to compute for distribution files -->
   <property name="checksum.algorithm" value="md5" />
@@ -37,17 +36,6 @@
     <pathelement location="${build.dir}/classes/java"/>
   </path>
 
-  <!-- Javadoc classpath -->
-  <path id="javadoc.classpath">
-    <path refid="classpath"/>
-    <pathelement location="${ant.home}/lib/ant.jar"/>
-
-    <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
-    <fileset dir="contrib">
-        <include name="**/*.jar"/>
-    </fileset>
-  </path>
-
   <path id="demo.classpath">
     <path refid="classpath"/>
     <pathelement location="${build.dir}/classes/demo"/>
@@ -189,29 +177,137 @@
       <echo>DEPRECATED - Doing Nothing.  See http://wiki.apache.org/lucene-java/HowToUpdateTheWebsite</echo>
   </target>
 
-  <target name="javadocs" description="Generate javadoc" depends="build-contrib">
-    <mkdir dir="${build.dir}/docs/api"/>
-    <invoke-javadoc
-      access="protected"
-      destdir="${build.dir}/docs/api"
-    />
+  <target name="javadocs" description="Generate javadoc" 
+  	      depends="javadocs-all, javadocs-core, javadocs-demo, javadocs-contrib"/>
+	
+  <target name="javadocs-core" description="Generate javadoc for core classes">
+  	<sequential>
+      <mkdir dir="${javadoc.dir}/core"/>
+      <invoke-javadoc
+        destdir="${javadoc.dir}/core"
+      	title="${Name} ${version} core API">
+        <sources>
+          <packageset dir="src/java"/>
+          <link href="../"/>
+        </sources>
+      </invoke-javadoc>
+     <jarify basedir="${javadoc.dir}/core" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+    </sequential>
   </target>
 
-  <target name="javadocs-internal" depends="build-contrib">
-    <mkdir dir="${build.dir}/docs/api-internal"/>
-    <invoke-javadoc
-      access="package"
-      destdir="${build.dir}/docs/api-internal"
-    />
+  <target name="javadocs-demo" description="Generate javadoc for demo classes">
+  	<sequential>
+      <mkdir dir="${javadoc.dir}/demo"/>
+      <invoke-javadoc
+        destdir="${javadoc.dir}/demo"
+      	title="${Name} ${version} demo API">
+        <sources>
+          <packageset dir="src/demo"/>
+          <link href="../"/>
+        </sources>
+      </invoke-javadoc>
+      <jarify basedir="${javadoc.dir}/demo" destfile="${build.dir}/${demo.name}-javadoc.jar"/>
+    </sequential>
   </target>
+	
+  <target name="javadocs-contrib" description="Generate javadoc for contrib classes">
+    <contrib-crawl target="javadocs"
+                   failonerror="false"/>
+  </target>
+  	
+  <target name="javadocs-all" description="Generate javadoc for core, demo and contrib classes" depends="build-contrib">
+  	<sequential>
+      <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
+        <include name="**" if="build-1-5-contrib" />
+      </dirset>
+      <dirset dir="contrib/gdata-server/src/gom/src/java" id="gdata-server-gom">
+        <include name="**" if="build-1-5-contrib" />
+      </dirset>
+      <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
+        <include name="**" if="build-1-5-contrib" />
+      </dirset>
+  		
+      <mkdir dir="${javadoc.dir}"/>
+      <invoke-javadoc
+        destdir="${javadoc.dir}">
+        <sources>
+          <!-- TODO: find a dynamic way to do include multiple source roots -->
+          <packageset dir="src/java"/>
 
+          <packageset dir="src/demo"/>
 
+          <!-- please keep this list up to date, and in alpha order...   -->
+          <!-- with the minor exception of gdata which is managed by ref -->
+        
+          <!-- ie: `find contrib/* -path \*src/java | grep -v gdata | sort` -->
+
+          <!-- if you make changes to the list of package sets, also -->
+          <!-- make sure the group list below is updated.            -->
+
+          <packageset dir="contrib/analyzers/src/java"/>
+          <packageset dir="contrib/ant/src/java"/>
+          <packageset dir="contrib/benchmark/src/java"/>
+          <packageset dir="contrib/db/bdb-je/src/java"/>
+          <packageset dir="contrib/db/bdb/src/java"/>
+          <packageset dir="contrib/highlighter/src/java"/>
+          <packageset dir="contrib/lucli/src/java"/>
+          <packageset dir="contrib/memory/src/java"/>
+          <packageset dir="contrib/miscellaneous/src/java"/>
+          <packageset dir="contrib/queries/src/java"/>
+          <packageset dir="contrib/regex/src/java"/>
+          <packageset dir="contrib/similarity/src/java"/>
+          <packageset dir="contrib/snowball/src/java"/>
+          <packageset dir="contrib/spellchecker/src/java"/>
+          <packageset dir="contrib/surround/src/java"/>
+          <packageset dir="contrib/swing/src/java"/>
+          <packageset dir="contrib/wordnet/src/java"/>
+          <packageset dir="contrib/xml-query-parser/src/java"/>
+          <!-- end alpha sort -->
+          <packageset refid="gdata-server-core" />
+          <packageset refid="gdata-server-gom" />
+          <packageset refid="gdata-server-hivemind" />
+
+          <!-- If the main javadoc Group listing includes an "Other   -->
+          <!-- Packages" group after the ones listed here, then those -->
+          <!-- packages are not being matched by any of these rules   -->
+  
+          <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
+  
+          <group title="Demo" packages="org.apache.lucene.demo*"/>
+  
+          <group title="contrib: Analysis" packages="org.apache.lucene.analysis.*"/>
+          <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
+          <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
+          <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
+          <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
+          <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
+          <group title="contrib: Lucli" packages="lucli*"/>
+          <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
+          <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
+          <group title="contrib: Queries" packages="org.apache.lucene.search.similar*"/>
+          <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
+          <!-- no group for similarity. -->
+          <!-- nothing in there at the moment, so no package structure -->
+          <group title="contrib: Snowball" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
+
+          <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
+          <group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
+          <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
+          <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
+          <group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
+
+        </sources>
+      </invoke-javadoc>
+  	</sequential>
+  </target>
+
+
   <!-- ================================================================== -->
   <!-- D I S T R I B U T I O N                                            -->
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist">
+  <target name="package" depends="jar-core, javadocs-all, war-demo, build-contrib, init-dist">
      <copy file="${build.demo.template}" tofile="${build.dir}/build-demo.xml">
         <filterset begintoken="@PLACEHOLDER_" endtoken="@"> 
 	  <filter token="version" value="${version}"/>
@@ -350,13 +446,15 @@
 
   <target name="dist-all" depends="dist, dist-src"/>
 
-  <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-demo-src">
+  <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-demo-src, javadocs">
     <sequential>
       <m2-deploy pom.xml="lucene-parent-pom.xml.template"/>
       <m2-deploy pom.xml="lucene-core-pom.xml.template">
         <artifact-attachments>
           <attach file="${build.dir}/${final.name}-src.jar"
                   classifier="sources"/>
+          <attach file="${build.dir}/${final.name}-javadoc.jar"
+                  classifier="javadoc"/>
         </artifact-attachments>
       </m2-deploy>
       
@@ -364,6 +462,8 @@
         <artifact-attachments>
           <attach file="${build.dir}/${demo.name}-src.jar"
                   classifier="sources"/>
+          <attach file="${build.dir}/${demo.name}-javadoc.jar"
+                  classifier="javadoc"/>
         </artifact-attachments>
       </m2-deploy>
       
@@ -491,112 +591,6 @@
     <fail if="contribs.failed">Contrib tests failed!</fail>
   </target>
 
-  <macrodef name="invoke-javadoc">
-    <attribute name="access"/>
-    <attribute name="destdir"/>
-    <sequential>
-    
-      <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-      <dirset dir="contrib/gdata-server/src/gom/src/java" id="gdata-server-gom">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-      <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
-        <include name="**" if="build-1-5-contrib" />
-      </dirset>
-
-      <javadoc
-          overview="src/java/overview.html"
-          packagenames="org.apache.lucene.*"
-          destdir="@{destdir}"
-          access="@{access}"
-          encoding="${build.encoding}"
-          author="true"
-          version="true"
-          use="true"
-          source="${ant.java.version}"
-          link="${javadoc.link}"
-          windowtitle="${Name} ${version} API"
-          doctitle="${Name} ${version} API"
-          bottom="Copyright &amp;copy; ${year} Apache Software Foundation.  All Rights Reserved.">
-        <tag name="todo" description="To Do:"/>
-        <tag name="uml.property" description="UML Property:"/>
-
-        <!-- TODO: find a dynamic way to do include multiple source roots -->
-
-        <packageset dir="src/java"/>
-
-        <packageset dir="src/demo"/>
-
-        <!-- please keep this list up to date, and in alpha order...   -->
-        <!-- with the minor exception of gdata which is managed by ref -->
-        
-        <!-- ie: `find contrib/* -path \*src/java | grep -v gdata | sort` -->
-
-        <!-- if you make changes to the list of package sets, also -->
-        <!-- make sure the group list below is updated.            -->
-
-        <packageset dir="contrib/analyzers/src/java"/>
-        <packageset dir="contrib/ant/src/java"/>
-        <packageset dir="contrib/benchmark/src/java"/>
-        <packageset dir="contrib/db/bdb-je/src/java"/>
-        <packageset dir="contrib/db/bdb/src/java"/>
-        <packageset dir="contrib/highlighter/src/java"/>
-        <packageset dir="contrib/lucli/src/java"/>
-        <packageset dir="contrib/memory/src/java"/>
-        <packageset dir="contrib/miscellaneous/src/java"/>
-        <packageset dir="contrib/queries/src/java"/>
-        <packageset dir="contrib/regex/src/java"/>
-        <packageset dir="contrib/similarity/src/java"/>
-        <packageset dir="contrib/snowball/src/java"/>
-        <packageset dir="contrib/spellchecker/src/java"/>
-        <packageset dir="contrib/surround/src/java"/>
-        <packageset dir="contrib/swing/src/java"/>
-        <packageset dir="contrib/wordnet/src/java"/>
-        <packageset dir="contrib/xml-query-parser/src/java"/>
-        <!-- end alpha sort -->
-        <packageset refid="gdata-server-core" />
-        <packageset refid="gdata-server-gom" />
-        <packageset refid="gdata-server-hivemind" />
-
-        <!-- If the main javadoc Group listing includes an "Other   -->
-        <!-- Packages" group after the ones listed here, then those -->
-        <!-- packages are not being matched by any of these rules   -->
-        
-        <group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*"/>
-
-        <group title="Demo" packages="org.apache.lucene.demo*"/>
-
-        <group title="contrib: Analysis" packages="org.apache.lucene.analysis.*"/>
-        <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
-        <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
-        <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
-        <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
-        <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
-        <group title="contrib: Lucli" packages="lucli*"/>
-        <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
-        <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
-        <group title="contrib: Queries" packages="org.apache.lucene.search.similar*"/>
-        <group title="contrib: RegEx" packages="org.apache.lucene.search.regex*:org.apache.regexp*"/>
-        <!-- no group for similarity. -->
-        <!-- nothing in there at the moment, so no package structure -->
-        <group title="contrib: Snowball" packages="org.apache.lucene.analysis.snowball*:net.sf.snowball*"/>
-
-        <group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
-        <group title="contrib: Surround Parser" packages="org.apache.lucene.queryParser.surround*"/>
-        <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
-        <group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
-        <group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
-
-
-        <classpath refid="javadoc.classpath"/>
-
-      </javadoc>
-
-   </sequential>
-  </macrodef>
-	
   <!-- Macro for building checksum files
        This is only needed until the "format" option is supported
        by ant's built in checksum task
Index: common-build.xml
===================================================================
--- common-build.xml	(revision 593961)
+++ common-build.xml	(working copy)
@@ -48,7 +48,21 @@
   <property name="javac.debug" value="on"/>
   <property name="javac.source" value="1.4"/>
   <property name="javac.target" value="1.4"/>
-
+
+  <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+  <property name="javadoc.access" value="protected"/>
+  <property name="javadoc.dir" value="${common.dir}/build/docs/api"/>
+  <!-- Javadoc classpath -->
+  <path id="javadoc.classpath">
+    <path refid="classpath"/>
+    <pathelement location="${ant.home}/lib/ant.jar"/>
+
+  	<!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
+    <fileset dir="${common.dir}/contrib">
+        <include name="**/*.jar"/>
+    </fileset>
+  </path>
+	
   <property name="project.name" value="site"/> <!-- todo: is this used by anakia or something else? -->
   <property name="build.encoding" value="utf-8"/>
 
@@ -480,8 +494,39 @@
         <containsregexp expression="Generated.*By.*JavaCC"/>
       </fixcrlf>
     </sequential>
-  </macrodef>
+  </macrodef>
+	
+  <macrodef name="invoke-javadoc">
+    <element name="sources" optional="yes"/>
+    <attribute name="destdir"/>
+  	<attribute name="title" default="${Name} ${version} API"/>
+    <sequential>
+      <javadoc
+          overview="src/java/overview.html"
+          packagenames="org.apache.lucene.*"
+          destdir="@{destdir}"
+          access="${javadoc.access}"
+          encoding="${build.encoding}"
+          author="true"
+          version="true"
+          use="true"
+          source="${ant.java.version}"
+          link="${javadoc.link}"
+          windowtitle="${Name} ${version} API"
+          doctitle="@{title}"
+          bottom="Copyright &amp;copy; ${year} Apache Software Foundation.  All Rights Reserved.">
+        <tag name="todo" description="To Do:"/>
+        <tag name="uml.property" description="UML Property:"/>
+      	<link offline="true" packagelistLoc="${javadoc.dir}"/>
+      	
+      	<sources />
+      	      	
+        <classpath refid="javadoc.classpath"/>
+      </javadoc>
+   </sequential>
+  </macrodef>
 
+
 </project>
 
 
Index: contrib/contrib-build.xml
===================================================================
--- contrib/contrib-build.xml	(revision 593961)
+++ contrib/contrib-build.xml	(working copy)
@@ -77,14 +77,29 @@
 			
   <target name="dist-maven" if="pom.xml.present" depends="compile-core, jar-src">
     <sequential>
-      <jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-sources.jar"/>
       <m2-deploy>
         <artifact-attachments>
           <attach file="${build.dir}/${final.name}-src.jar"
-                  classifier="sources"/>
+                  classifier="sources"/>
+          <attach file="${build.dir}/${final.name}-javadoc.jar"
+                  classifier="javadoc"/>
         </artifact-attachments>
       </m2-deploy>
     </sequential>
   </target>
-
+
+  <target name="javadocs">
+   	<sequential>
+       <mkdir dir="${javadoc.dir}/contrib-${name}"/>
+       <invoke-javadoc
+         destdir="${javadoc.dir}/contrib-${name}"
+       	title="${Name} ${version} contrib-${name} API">
+         <sources>
+           <link href="../"/>
+           <packageset dir="src/java"/>
+        </sources>
+      </invoke-javadoc>
+      <jarify basedir="${javadoc.dir}/contrib-${name}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
+    </sequential>
+  </target>	
 </project>
Index: contrib/db/build.xml
===================================================================
--- contrib/db/build.xml	(revision 593961)
+++ contrib/db/build.xml	(working copy)
@@ -58,5 +58,11 @@
     <ant dir="bdb" target="dist-maven" />
     <ant dir="bdb-je" target="dist-maven" />
   </target>  	
+
+  <target name="javadocs">
+    <ant dir="bdb" target="javadocs" />
+    <ant dir="bdb-je" target="javadocs" />
+  </target>  	
+
 	
 </project>
Index: contrib/similarity/build.xml
===================================================================
--- contrib/similarity/build.xml	(revision 593961)
+++ contrib/similarity/build.xml	(working copy)
@@ -24,4 +24,8 @@
   </description>
 
   <import file="../contrib-build.xml"/>
+	
+<!-- Only needed as long as this contrib has no content -->	
+  <target name="javadocs" />
+  <target name="dist-maven" />
 </project>
Index: src/site/src/documentation/content/xdocs/site.xml
===================================================================
--- src/site/src/documentation/content/xdocs/site.xml	(revision 593961)
+++ src/site/src/documentation/content/xdocs/site.xml	(working copy)
@@ -48,8 +48,35 @@
   </about>
     <!-- keep in submenu items alpha order -->
   <docs label="Documentation">
-
-      <apidocs label="API Docs" href="ext:javadocs"/>
+      <javadoc label="Javadocs">
+         <javadoc-all label="All (Core, Demo, Contrib)" href="ext:javadocs-all"/>
+		 <javadoc-core label="Core" href="ext:javadocs-core"/>
+		 <javadoc-demo label="Demo" href="ext:javadocs-demo"/>
+		 <javadoc-contrib label="Contrib">
+		    <javadoc-contrib-analyzers label="Analyzers" href="ext:javadocs-contrib-analyzers"/>
+		    <javadoc-contrib-ant label="Ant" href="ext:javadocs-contrib-ant"/>
+		    <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
+		    <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
+		    <javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
+<!--
+		    <javadoc-contrib-gdata label="GData" href="ext:javadocs-contrib-gdata"/>
+-->
+		    <javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
+		    <javadoc-contrib-lucli label="Lucli" href="ext:javadocs-contrib-lucli"/>
+		    <javadoc-contrib-memory label="Memory" href="ext:javadocs-contrib-memory"/>
+		    <javadoc-contrib-misc label="Miscellaneous" href="ext:javadocs-contrib-misc"/>
+		    <javadoc-contrib-queries label="Queries" href="ext:javadocs-contrib-queries"/>
+		    <javadoc-contrib-regex label="Regex" href="ext:javadocs-contrib-regex"/>
+<!-- This package has currently no content			
+		    <javadoc-contrib-similarity label="Similarity" href="ext:javadocs-contrib-similarity"/>
+-->			
+            <javadoc-contrib-snowball label="Snowball" href="ext:javadocs-contrib-snowball"/>
+		    <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
+		    <javadoc-contrib-surround label="Surround" href="ext:javadocs-contrib-surround"/>			
+		    <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>		    <javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>			
+		    <javadoc-contrib-xml-query-parser label="XML Query Parser" href="ext:javadocs-contrib-xml-query-parser"/>			
+		 </javadoc-contrib>
+	  </javadoc>
       <benchmarks label="Benchmarks" href="benchmarks.html"/>
       <contributions label="Contributions" href="contributions.html"/>
       <faq         label="FAQ"              href="ext:faq" />
@@ -99,7 +126,29 @@
   -->
 
   <external-refs>
-    <javadocs href="api/index.html"/>
+    <javadocs-all href="api/index.html"/>
+	<javadocs-core href="api/core/index.html"/>
+	<javadocs-demo href="api/demo/index.html"/>
+	<javadocs-contrib-analyzers href="api/contrib-analyzers/index.html"/>
+	<javadocs-contrib-ant href="api/contrib-ant/index.html"/>
+	<javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
+	<javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
+	<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
+	<javadocs-contrib-gdata href="api/contrib-gdata/index.html"/>
+	<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
+	<javadocs-contrib-lucli href="api/contrib-lucli/index.html"/>
+	<javadocs-contrib-memory href="api/contrib-memory/index.html"/>
+	<javadocs-contrib-misc href="api/contrib-misc/index.html"/>
+	<javadocs-contrib-queries href="api/contrib-queries/index.html"/>
+	<javadocs-contrib-regex href="api/contrib-regex/index.html"/>
+	<javadocs-contrib-similarity href="api/contrib-similarity/index.html"/>
+	<javadocs-contrib-snowball href="api/contrib-snowball/index.html"/>
+	<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
+	<javadocs-contrib-surround href="api/contrib-surround/index.html"/>
+	<javadocs-contrib-swing href="api/contrib-swing/index.html"/>
+	<javadocs-contrib-wordnet href="api/contrib-wordnet/index.html"/>
+	<javadocs-contrib-xml-query-parser href="api/contrib-xml-query-parser/index.html"/>
+	
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
       <validation href="docs/validation.html"/>