diff --git a/CHANGES.txt b/CHANGES.txt
deleted file mode 100644
index 34e1fab..0000000
--- a/CHANGES.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Version 1.0.1 (released 20-Oct-2003)
-  * Added a "type" attribute to the Search tag.
-      - It can be used to specify the type of documents (e.g.: pdf) to be
-        searched.
-  * Changed the behavior of the SearchQuery Tag.
-      - By default only the specified search keywords (or phrase) are
-        returned. To return the full query (including preset site and
-        file type options) the "type" attribute should be set to "full".
-
-Version 1.0 (released 10-Oct-2003)
-  * This is the first public release.
-  * Added support for various HTTP Proxy configuration context parameters.
-  
-===========================================================================
-$Id$
\ No newline at end of file
diff --git a/README-BUILD.txt b/README-BUILD.txt
deleted file mode 100644
index 024d337..0000000
--- a/README-BUILD.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-Google Tag Library README (BUILD)
-=================================
-
-
-Overview
-========
-
-This README file describes the Google Tag Library source distribution.
-
-With the Google JSP Tag Library, developers and designers can easily
-incorporate Google queries, search results, cached pages and spelling
-suggestions into any web site or application.
-
-For more information about using the custom tag library in your own web
-applications, point your browser to:
-
-	http://google-taglib.sourceforge.net/
-
-See the "LICENSE.txt" file for licensing details.
-
-The Google Tag Library uses the Google Web APIs, but is not associated with
-or sponsored by Google, Inc.
-
-Google Web APIs
-===============
-
-The Google Web APIs Java library is required in order to build the Google
-Tag Library. The library's JAR file (googleapi.jar) should be placed into
-the lib directory.
-
-	http://www.google.com/apis/download.html
-	
-
-Building the Source
-===================
-
-The Google Tag Library is built using Ant. 
-
-	http://ant.apache.org/
-	
-
-To build the JAR, to do the following:
-
-	ant
-	
-To build the TLDs, do the following:
-
-	ant tlds
-	
-To build the release archives, do the following:
-
-	ant release
-	
-To build the Examples WAR, do the following:
-
-	ant examples
-	
-To list all available build targets, do the following:
-
-	ant -projecthelp
-
-
-===========================================================================
-$Id$
\ No newline at end of file
diff --git a/build.xml b/build.xml
deleted file mode 100644
index dca0cc0..0000000
--- a/build.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="google" default="jar" basedir=".">
-	<description>Google Tag Library</description>
-	<!-- Load the properties -->
-	<property file="build.properties"/>
-	<!-- Build Locations -->
-	<property name="build.library" value="${build.dir}/${project.name}"/>
-	<property name="build.ex" value="${build.dir}/${ex.dir}"/>
-	<property name="build.unit" value="${build.dir}/${unit.dir}"/>
-	<property name="build.release" value="${build.dir}/${release.name}"/>
-	<!-- Jar excludes directories and files -->
-	<patternset id="jar.excludes">
-		<exclude name="**/*.java"/>
-		<exclude name="**/*.xml"/>
-		<exclude name="**/*.html"/>
-		<exclude name="**/.dependency-info/**"/>
-	</patternset>
-	<!-- Classpath -->
-	<path id="classpath">
-		<pathelement location="."/>
-		<fileset dir="${lib.dir}">
-			<include name="**/*.jar"/>
-			<include name="**/*.zip"/>
-		</fileset>
-	</path>
-	<!-- Prepare target -->
-	<target name="prepare">
-		<mkdir dir="${build.dir}"/>
-		<mkdir dir="${dist.dir}"/>
-		<mkdir dir="${javadoc.dir}"/>
-		<mkdir dir="${tlddoc.dir}"/>
-	</target>
-	<!-- Compile target -->
-	<target name="compile" depends="prepare" description="Compiles sources">
-		<mkdir dir="${build.library}"/>
-		<javac srcdir="${src.dir}" destdir="${build.library}" target="1.1">
-			<classpath refid="classpath"/>
-		</javac>
-	</target>
-	<!-- JAR target -->
-	<target name="jar" depends="compile" description="Builds the JAR">
-		<!-- Create the JAR -->
-		<jar jarfile="${dist.dir}/${project.name}.jar">
-			<fileset dir="${build.library}">
-				<patternset refid="jar.excludes"/>
-			</fileset>
-		</jar>
-	</target>
-	<!-- TLDs target -->
-	<target name="tlds" description="Builds the TLDs">
-		<!-- Copy the TLDs -->
-		<filter token="version" value="${version}"/>
-		<copy file="${tlds.dir}/${project.name}.tld" todir="${dist.dir}" filtering="true"/>
-		<copy file="${tlds.dir}/${project.name}-1.2.tld" todir="${dist.dir}" filtering="true"/>
-	</target>
-	<!-- Examples target -->
-	<target name="examples" depends="jar,tlds" description="Builds the Examples WAR">
-		<!-- Copy the WAR dir -->
-		<copy todir="${build.ex}">
-			<fileset dir="${ex.dir}"/>
-		</copy>
-		<!-- Copy the TLD -->
-		<copy file="${dist.dir}/${project.name}.tld" todir="${build.ex}/WEB-INF"/>
-		<!-- Copy the license -->
-		<copy file="${licenses.dir}/${doc.license}" todir="${build.ex}"/>
-		<!-- Copy the JAR -->
-		<copy file="${dist.dir}/${project.name}.jar" todir="${build.ex}/WEB-INF/lib/"/>
-		<!-- Freeze the mod dates -->
-		<touch>
-			<fileset dir="${build.ex}"/>
-		</touch>
-		<!-- Create the web archive -->
-		<jar jarfile="${dist.dir}/${ex.dir}-${version}.war" basedir="${build.ex}"/>
-	</target>
-	<!-- TagUnit target -->
-	<target name="tagunit" depends="jar,tlds" description="Builds the TagUnit WAR">
-		<!-- Copy the WAR dir -->
-		<copy todir="${build.unit}">
-			<fileset dir="${unit.dir}"/>
-		</copy>
-		<!-- Copy the TLD -->
-		<copy file="${dist.dir}/${project.name}.tld" todir="${build.unit}/WEB-INF"/>
-		<!-- Copy the license -->
-		<copy file="${licenses.dir}/${doc.license}" todir="${build.unit}"/>
-		<!-- Copy the JAR -->
-		<copy file="${dist.dir}/${project.name}.jar" todir="${build.unit}/WEB-INF/lib/"/>
-		<!-- Copy the TagUnit lib -->
-		<copy file="${lib.dir}/${unit.lib}" todir="${build.unit}/WEB-INF/lib/"/>
-		<!-- Freeze the mod dates -->
-		<touch>
-			<fileset dir="${build.unit}"/>
-		</touch>
-		<!-- Create the web archive -->
-		<jar jarfile="${dist.dir}/${unit.dir}-${version}.war" basedir="${build.unit}"/>
-	</target>
-	<!-- Release target -->
-	<target name="release" depends="jar,tlds" description="Builds the release archives">
-		<mkdir dir="${build.release}"/>
-		<!-- Copy the TLD -->
-		<filter token="version" value="${version}"/>
-		<copy file="${tlds.dir}/${project.name}.tld" todir="${build.release}" filtering="true"/>
-		<!-- Copy the license -->
-		<copy file="${licenses.dir}/${doc.license}" todir="${build.release}"/>
-		<!-- Copy the readme -->
-		<copy file="${doc.readme}" todir="${build.release}"/>
-		<!-- Copy the changes -->
-		<copy file="${doc.changes}" todir="${build.release}"/>
-		<!-- Copy the JAR -->
-		<copy file="${dist.dir}/${project.name}.jar" todir="${build.release}"/>
-		<!-- Freeze the mod dates -->
-		<touch>
-			<fileset dir="${build.release}"/>
-		</touch>
-		<!-- Create the ZIP archive -->
-		<zip destfile="${dist.dir}/${release.name}.zip" basedir="${build.dir}" includes="${release.name}/**"/>
-		<!-- Create the TAR archive -->
-		<tar tarfile="${dist.dir}/${release.name}.tar.gz" compression="gzip">
-			<tarfileset dir="${build.release}" prefix="${release.name}" mode="644"/>
-		</tar>
-	</target>
-	<!-- Src target -->
-	<target name="src" description="Builds the source archive">
-		<!-- Create the TAR archive -->
-		<tar tarfile="${dist.dir}/${release.name}-src.tar.gz" compression="gzip">
-			<tarfileset dir="${basedir}" prefix="${release.name}">
-				<include name="${src.dir}/**"/>
-				<include name="${tlds.dir}/**"/>
-				<include name="${lib.dir}/**"/>
-				<include name="${licenses.dir}/**"/>
-				<include name="${ex.dir}/**"/>
-				<include name="${unit.dir}/**"/>
-				<include name="${doc.readme}"/>
-				<include name="${doc.changes}"/>
-				<include name="${doc.src}"/>
-				<include name="${doc.dir}/**"/>
-				<include name="build.*"/>
-				<exclude name="${src.excludes}"/>
-			</tarfileset>
-		</tar>
-	</target>
-	<!-- Javadoc target -->
-	<target name="javadoc" depends="prepare" description="Builds the Javadoc">
-		<delete quiet="true" includeEmptyDirs="true">
-			<fileset dir="${javadoc.dir}" includes="*,*/**"/>
-		</delete>
-		<javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" packagenames="${javadoc.packages}" windowtitle="${javadoc.title}" verbose="false" failonerror="true" additionalparam="-breakiterator -tag created:Xt:&quot;Created:&quot;">
-			<classpath refid="classpath"/>
-		</javadoc>
-	</target>
-	<!-- TLDDoc target -->
-	<target name="tlddoc" depends="prepare,tlds" description="Builds the TLD documentation">
-		<delete quiet="true" includeEmptyDirs="true">
-			<fileset dir="${tlddoc.dir}" includes="*,*/**"/>
-		</delete>
-		<java jar="${lib.dir}/tlddoc.jar" failonerror="true" fork="true">
-			<arg line="-windowtitle &quot;${javadoc.title}&quot; -doctitle &quot;${javadoc.title}&quot; -d ${tlddoc.dir} ${dist.dir}/${project.name}-1.2.tld"/>
-		</java>
-	</target>
-	<!-- DocCheck target -->
-	<target name="doccheck" depends="prepare" description="Checks the Javadoc">
-		<delete quiet="true" includeEmptyDirs="true">
-			<fileset dir="${javadoc.dir}" includes="*,*/**"/>
-		</delete>
-		<javadoc sourcepath="${src.dir}" packagenames="${javadoc.packages}" destdir="${javadoc.dir}" verbose="false" failonerror="true" doclet="com.sun.tools.doclets.doccheck.DocCheck" docletpath="${lib.dir}/doccheck.jar">
-			<classpath refid="classpath"/>
-		</javadoc>
-	</target>
-	<!-- Clean Build target -->
-	<target name="clean-build" description="Cleans the build directory">
-		<delete quiet="true" includeEmptyDirs="true">
-			<fileset dir="${build.dir}" includes="*,*/**"/>
-		</delete>
-		<mkdir dir="${build.library}"/>
-	</target>
-	<!-- Clean target -->
-	<target name="clean" depends="clean-build" description="Cleans the build and dist directories">
-		<delete quiet="true" includeEmptyDirs="true">
-			<fileset dir="${dist.dir}" includes="*,*/**"/>
-		</delete>
-	</target>
-</project>
diff --git a/.gitignore b/google-taglib/.cvsignore
similarity index 85%
rename from .gitignore
rename to google-taglib/.cvsignore
index ec05815..c92873e 100644
--- a/.gitignore
+++ b/google-taglib/.cvsignore
@@ -1,7 +1,6 @@
 build
 dist
 javadoc
-tlddoc
 *.bat
 key.txt
 ChangeLog
\ No newline at end of file
diff --git a/GoogleTagLib.iml b/google-taglib/GoogleTagLib.iml
similarity index 95%
rename from GoogleTagLib.iml
rename to google-taglib/GoogleTagLib.iml
index 403273c..c800be7 100644
--- a/GoogleTagLib.iml
+++ b/google-taglib/GoogleTagLib.iml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4" relativePaths="false">
   <component name="LvcsConfiguration">
-    <option name="LOCAL_VCS_ENABLED" value="false" />
+    <option name="LOCAL_VCS_ENABLED" value="true" />
     <option name="LOCAL_VCS_PURGING_PERIOD" value="259200000" />
   </component>
   <component name="NewModuleRootManager">
diff --git a/GoogleTagLib.ipr b/google-taglib/GoogleTagLib.ipr
similarity index 100%
rename from GoogleTagLib.ipr
rename to google-taglib/GoogleTagLib.ipr
diff --git a/GoogleTagLib.iws b/google-taglib/GoogleTagLib.iws
similarity index 78%
rename from GoogleTagLib.iws
rename to google-taglib/GoogleTagLib.iws
index 9123839..fc6cdcf 100644
--- a/GoogleTagLib.iws
+++ b/google-taglib/GoogleTagLib.iws
@@ -16,7 +16,6 @@
     <property name="MemberChooser.showClasses" value="true" />
     <property name="MemberChooser.sorted" value="false" />
     <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="last_opened_file_path" value="C:\projects\Test" />
     <property name="GoToClass.toSaveIncludeLibraries" value="false" />
   </component>
   <component name="ToolWindowManager">
@@ -29,7 +28,7 @@
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.31519508" order="2" />
       <window_info id="Javadoc" active="false" anchor="right" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33028457" order="3" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33126935" order="6" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.26283368" order="0" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33264887" order="0" />
       <window_info id="App Server" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="11" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.28131416" order="1" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32970452" order="1" />
@@ -37,7 +36,7 @@
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="0.33490565" order="9" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3993808" order="5" x="20" y="255" width="984" height="258" />
       <window_info id="DocBrowser" active="false" anchor="left" auto_hide="true" internal_type="sliding" type="sliding" visible="false" weight="1.0" order="3" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.20225872" order="1" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.20225872" order="1" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5209953" order="2" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
       <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="4" />
@@ -66,7 +65,13 @@
   <component name="ProjectViewSettings">
     <navigator currentView="ProjectPane" flattenPackages="false" showMembers="false" showModules="false" showLibraryContents="false" hideEmptyPackages="false" showStructure="false" autoscrollToSource="false" splitterProportion="0.5" />
     <view id="ProjectPane">
+      <expanded_node type="directory" url="file://$PROJECT_DIR$/src/net/thauvin/google" />
+      <expanded_node type="directory" url="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs" />
+      <expanded_node type="directory" url="file://$PROJECT_DIR$/src/net/thauvin" />
+      <expanded_node type="directory" url="file://$PROJECT_DIR$/tlds" />
+      <expanded_node type="directory" url="file://$PROJECT_DIR$/src/net" />
       <expanded_node type="directory" url="file://$PROJECT_DIR$" />
+      <expanded_node type="directory" url="file://$PROJECT_DIR$/src" />
     </view>
     <view id="PackagesPane" />
   </component>
@@ -95,17 +100,73 @@
     </todo-panel>
   </component>
   <component name="FileEditorManager" split-orientation="horizontal" split-proportion="0.5">
-    <first-group selected-file="file://$PROJECT_DIR$/build.properties">
-      <entry file="file://$PROJECT_DIR$/build.xml" pinned="false">
+    <first-group selected-file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/KeySupport.java">
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/Search.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="12" column="34" selection-start="600" selection-end="600" vertical-scroll-proportion="-4.050934">
+          <state line="55" column="41" selection-start="2131" selection-end="2131" vertical-scroll-proportion="0.3096539">
             <folding />
           </state>
         </provider>
       </entry>
-      <entry file="file://$PROJECT_DIR$/build.properties" pinned="false">
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/QuerySupport.java" pinned="false">
         <provider selected="true" editor-type-id="text-editor">
-          <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <state line="55" column="45" selection-start="2226" selection-end="2226" vertical-scroll-proportion="-0.29690346">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/StyleSupport.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="49" column="22" selection-start="1996" selection-end="1996" vertical-scroll-proportion="-1.0437158">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/SearchResultSupport.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="54" column="22" selection-start="2174" selection-end="2174" vertical-scroll-proportion="-3.3351548">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/SearchResult.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="59" column="7" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.41347906">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/CachedPage.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="87" column="8" selection-start="2437" selection-end="2989" vertical-scroll-proportion="0.66302365">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/Spelling.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="52" column="13" selection-start="2053" selection-end="2053" vertical-scroll-proportion="0.20400728">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/KeySupport.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="56" column="8" selection-start="2354" selection-end="2354" vertical-scroll-proportion="0.55737704">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/EstimatedTotal.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="48" column="13" selection-start="1970" selection-end="1970" vertical-scroll-proportion="0.4025501">
+            <folding />
+          </state>
+        </provider>
+      </entry>
+      <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/GoogleSearchBean.java" pinned="false">
+        <provider selected="true" editor-type-id="text-editor">
+          <state line="52" column="28" selection-start="2142" selection-end="2142" vertical-scroll-proportion="0.3406193">
             <folding />
           </state>
         </provider>
@@ -114,6 +175,78 @@
     <second-group />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/google-examples/WEB-INF/web.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="8" column="70" selection-start="405" selection-end="405" vertical-scroll-proportion="0.23776224">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/TagUtility.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="61" column="7" selection-start="2249" selection-end="2249" vertical-scroll-proportion="0.44821733">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/htdocs/docs.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="374" column="59" selection-start="15401" selection-end="15409" vertical-scroll-proportion="0.3327674">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tlds/google.tld">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="148" column="20" selection-start="4208" selection-end="4208" vertical-scroll-proportion="4.271647">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="33" column="73" selection-start="1193" selection-end="1193" vertical-scroll-proportion="0.39388794">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/QuerySupport.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="55" column="45" selection-start="2226" selection-end="2226" vertical-scroll-proportion="-0.29690346">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/StyleSupport.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="49" column="22" selection-start="1996" selection-end="1996" vertical-scroll-proportion="-1.0437158">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/SearchResultSupport.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="54" column="22" selection-start="2174" selection-end="2174" vertical-scroll-proportion="-3.3351548">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/SearchResult.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="59" column="7" selection-start="2237" selection-end="2237" vertical-scroll-proportion="0.41347906">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/CachedPage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="87" column="8" selection-start="2437" selection-end="2989" vertical-scroll-proportion="0.66302365">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/EstimatedTotal.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="48" column="13" selection-start="1970" selection-end="1970" vertical-scroll-proportion="0.4025501">
@@ -121,102 +254,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/Spelling.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="13" selection-start="2053" selection-end="2053" vertical-scroll-proportion="0.21311475">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/CachedPage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="87" column="8" selection-start="2437" selection-end="2989" vertical-scroll-proportion="0.6643234">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/StyleSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="49" column="22" selection-start="1996" selection-end="1996" vertical-scroll-proportion="0.032786883">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/TagUtility.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="147" column="53" selection-start="4211" selection-end="4211" vertical-scroll-proportion="1.010929">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/KeySupport.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="63" column="22" selection-start="2477" selection-end="2477" vertical-scroll-proportion="0.7741348">
+        <state line="56" column="8" selection-start="2354" selection-end="2354" vertical-scroll-proportion="0.55737704">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/QuerySupport.java">
+    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/Spelling.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="55" column="45" selection-start="2226" selection-end="2226" vertical-scroll-proportion="0.54826957">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tlds/google.tld">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="183" column="8" selection-start="5123" selection-end="5123" vertical-scroll-proportion="0.41086587">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/SearchResultSupport.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="114" column="16" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.3327674">
+        <state line="52" column="13" selection-start="2053" selection-end="2053" vertical-scroll-proportion="0.20400728">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/Search.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="13" selection-start="2062" selection-end="2062" vertical-scroll-proportion="0.32088286">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/taglibs/SearchQuery.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="47" column="10" selection-start="1951" selection-end="1951" vertical-scroll-proportion="0.12563667">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../../Test/Test.iws">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="20534" vertical-scroll-proportion="0.0">
+        <state line="55" column="41" selection-start="2131" selection-end="2131" vertical-scroll-proportion="0.3096539">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/net/thauvin/google/GoogleSearchBean.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="52" column="36" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.31748727">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="34" selection-start="600" selection-end="600" vertical-scroll-proportion="-4.050934">
+        <state line="52" column="28" selection-start="2142" selection-end="2142" vertical-scroll-proportion="0.3406193">
           <folding />
         </state>
       </provider>
@@ -457,6 +518,16 @@
   </component>
   <component name="JavadocPlugin.JavadocProjectComponent">
     <JavadocEntries>
+      <JavadocEntry>
+        <option name="path" value="$PROJECT_DIR$/../../../../jdk1.3.1_08/docs/api/" />
+        <option name="name" value="C/jdk1.3.1_08/docs/api/" />
+        <option name="indexed" value="false" />
+      </JavadocEntry>
+      <JavadocEntry>
+        <option name="path" value="$PROJECT_DIR$/../../../jdk1.3.1_08/docs/api/" />
+        <option name="name" value="C/jdk1.3.1_08/docs/api/" />
+        <option name="indexed" value="false" />
+      </JavadocEntry>
       <JavadocEntry>
         <option name="path" value="$PROJECT_DIR$/../../../jdk1.3.1_09/docs/api/" />
         <option name="name" value="C/jdk1.3.1_09/docs/api/" />
diff --git a/README.txt b/google-taglib/README.txt
similarity index 100%
rename from README.txt
rename to google-taglib/README.txt
diff --git a/build.properties b/google-taglib/build.properties
similarity index 53%
rename from build.properties
rename to google-taglib/build.properties
index 42ebc67..ae81e9c 100644
--- a/build.properties
+++ b/google-taglib/build.properties
@@ -1,5 +1,5 @@
 # Version
-version=1.0.1
+version=1.0
 
 # Project
 project.name=google
@@ -12,28 +12,13 @@ dist.dir=dist
 lib.dir=lib
 tlds.dir=tlds
 licenses.dir=licenses
-
-# Examples
-ex.dir=${project.name}-examples
-
-# Source
-src.excludes=${lib.dir}/googleapi.jar
-
-# TagUnit
-unit.lib=tagunit.jar
-unit.dir=${project.name}-tagunit
+war.dir=${project.name}-examples
 
 # Javadoc
 javadoc.dir=javadoc
 javadoc.title=Google Tag Library
 javadoc.packages=net.thauvin.google.*
 
-# TLDDoc
-tlddoc.dir=tlddoc
-
 # Docs
-doc.dir=htdocs
 doc.license=LICENSE.txt
-doc.readme=README.txt
-doc.src=README-BUILD.txt
-doc.changes=CHANGES.txt
\ No newline at end of file
+doc.readme=README.txt
\ No newline at end of file
diff --git a/rss/build.xml b/google-taglib/build.xml
similarity index 58%
rename from rss/build.xml
rename to google-taglib/build.xml
index d51e9e0..c497ff0 100644
--- a/rss/build.xml
+++ b/google-taglib/build.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="google-rss" default="jar" basedir=".">
-	<description>Google RSS Tag Library</description>
+<project name="google" default="jar" basedir=".">
+	<description>Google Tag Library</description>
 	<!-- Load the properties -->
 	<property file="build.properties"/>
 	<!-- Build Locations -->
 	<property name="build.library" value="${build.dir}/${project.name}"/>
-	<property name="build.ex" value="${build.dir}/${ex.dir}"/>
+	<property name="build.war" value="${build.dir}/${war.dir}"/>
 	<property name="build.release" value="${build.dir}/${release.name}"/>
 	<!-- Jar excludes directories and files -->
 	<patternset id="jar.excludes">
@@ -17,7 +17,6 @@
 	<!-- Classpath -->
 	<path id="classpath">
 		<pathelement location="."/>
-		<pathelement location="${google.jar}"/>
 		<fileset dir="${lib.dir}">
 			<include name="**/*.jar"/>
 			<include name="**/*.zip"/>
@@ -25,14 +24,14 @@
 	</path>
 	<!-- Prepare target -->
 	<target name="prepare">
-		<ant dir="${google.dir}" inheritAll="false" inheritRefs="false" target="${google.target}"/>
 		<mkdir dir="${build.dir}"/>
 		<mkdir dir="${dist.dir}"/>
+		<mkdir dir="${javadoc.dir}"/>
 	</target>
 	<!-- Compile target -->
 	<target name="compile" depends="prepare" description="Compiles sources">
 		<mkdir dir="${build.library}"/>
-		<javac srcdir="${src.dir}" destdir="${build.library}" target="1.2">
+		<javac srcdir="${src.dir}" destdir="${build.library}" target="1.1">
 			<classpath refid="classpath"/>
 		</javac>
 	</target>
@@ -45,72 +44,66 @@
 			</fileset>
 		</jar>
 	</target>
-	<!-- TLD target -->
-	<target name="tld" description="Builds the TLD">
-		<!-- Copy the TLDs -->
+	<!-- WAR target -->
+	<target name="war" depends="jar" description="Builds the WAR">
+		<!-- Copy the WAR dir -->
+		<copy todir="${build.war}">
+			<fileset dir="${war.dir}"/>
+		</copy>
+		<!-- Copy the TLD -->
 		<filter token="version" value="${version}"/>
-		<copy file="${tlds.dir}/${project.name}.tld" todir="${dist.dir}" filtering="true"/>
+		<copy file="${tlds.dir}/${project.name}.tld" todir="${build.war}/WEB-INF" filtering="true"/>
+		<!-- Copy the license -->
+		<copy file="${licenses.dir}/${doc.license}" todir="${build.war}"/>
+		<!-- Copy the JAR -->
+		<copy file="${dist.dir}/${project.name}.jar" todir="${build.war}/WEB-INF/lib/"/>
+		<!-- Freeze the mod dates -->
+		<touch>
+    		<fileset dir="${build.war}"/>
+    	</touch>
+		<!-- Create the web archive -->
+		<jar jarfile="${dist.dir}/${war.dir}-${version}.war" basedir="${build.war}"/>
 	</target>
 	<!-- Release target -->
-	<target name="release" depends="jar,tld" description="Builds the release archives">
+	<target name="release" depends="jar" description="Builds the release archives">
 		<mkdir dir="${build.release}"/>
 		<!-- Copy the TLD -->
 		<filter token="version" value="${version}"/>
 		<copy file="${tlds.dir}/${project.name}.tld" todir="${build.release}" filtering="true"/>
+		<!-- Copy the license -->
+		<copy file="${licenses.dir}/${doc.license}" todir="${build.release}"/>
 		<!-- Copy the readme -->
 		<copy file="${doc.readme}" todir="${build.release}"/>
-		<!-- Copy the license -->
-		<copy file="${doc.license}" todir="${build.release}"/>
 		<!-- Copy the JAR -->
 		<copy file="${dist.dir}/${project.name}.jar" todir="${build.release}"/>
 		<!-- Freeze the mod dates -->
 		<touch>
-			<fileset dir="${build.release}"/>
-		</touch>
+    		<fileset dir="${build.release}"/>
+    	</touch>
 		<!-- Create the ZIP archive -->
-		<zip destfile="${dist.dir}/${release.name}.zip" basedir="${build.dir}" includes="${release.name}/**"/>
+		<zip destfile="${dist.dir}/${release.name}.zip" basedir="${build.release}"/>
 		<!-- Create the TAR archive -->
 		<tar tarfile="${dist.dir}/${release.name}.tar.gz" compression="gzip">
-			<tarfileset dir="${build.release}" prefix="${release.name}" mode="644"/>
-		</tar>
+    		<tarfileset dir="${build.release}" prefix="${release.name}" mode="644"/>
+    	</tar>
 	</target>
-	<!-- Examples target -->
-	<target name="examples" depends="jar,tld" description="Builds the Examples WAR">
-		<!-- Copy the WAR dir -->
-		<copy todir="${build.ex}">
-			<fileset dir="${ex.dir}"/>
-		</copy>
-		<!-- Copy the TLD -->
-		<copy file="${dist.dir}/${project.name}.tld" todir="${build.ex}/WEB-INF"/>
-		<!-- Copy the license -->
-		<copy file="${doc.license}" todir="${build.ex}"/>
-		<!-- Copy the JAR -->
-		<copy file="${dist.dir}/${project.name}.jar" todir="${build.ex}/WEB-INF/lib/"/>
-		<!-- Copy the Google JAR -->
-		<copy file="${google.jar}" todir="${build.ex}/WEB-INF/lib/"/>
-		<!-- Copy the Google TLD -->
-		<copy file="${google.tld}" todir="${build.ex}/WEB-INF/"/>
-		<!-- Freeze the mod dates -->
-		<touch>
-			<fileset dir="${build.ex}"/>
-		</touch>
-		<!-- Create the web archive -->
-		<jar jarfile="${dist.dir}/${ex.dir}-${version}.war" basedir="${build.ex}"/>
+	<!-- Javadoc target -->
+	<target name="javadoc" depends="prepare" description="Builds the Javadoc">
+		<delete quiet="true" includeEmptyDirs="true">
+			<fileset dir="${javadoc.dir}" includes="*,*/**"/>
+		</delete>
+		<javadoc sourcepath="${src.dir}" destdir="${javadoc.dir}" packagenames="${javadoc.packages}" windowtitle="${javadoc.title}" verbose="false" failonerror="true" additionalparam="-breakiterator -tag created:Xt:&quot;Created:&quot;">
+			<classpath refid="classpath"/>
+		</javadoc>
 	</target>
-	<!-- Src target -->
-	<target name="src" description="Builds the source archive">
-		<!-- Create the TAR archive -->
-		<tar tarfile="${dist.dir}/${release.name}-src.tar.gz" compression="gzip">
-			<tarfileset dir="${basedir}" prefix="${release.name}">
-				<include name="${src.dir}/**"/>
-				<include name="${tlds.dir}/**"/>
-				<include name="${ex.dir}/**"/>
-				<include name="${doc.readme}"/>
-				<include name="${doc.license}"/>
-				<include name="${doc.src}"/>
-				<include name="build.*"/>
-			</tarfileset>
-		</tar>
+	<!-- DocCheck target -->
+	<target name="doccheck" depends="prepare" description="Checks the Javadoc">
+		<delete quiet="true" includeEmptyDirs="true">
+			<fileset dir="${javadoc.dir}" includes="*,*/**"/>
+		</delete>
+		<javadoc sourcepath="${src.dir}" packagenames="${javadoc.packages}" destdir="${javadoc.dir}" verbose="false" failonerror="true" doclet="com.sun.tools.doclets.doccheck.DocCheck" docletpath="${lib.dir}\doccheck.jar">
+			<classpath refid="classpath"/>
+		</javadoc>
 	</target>
 	<!-- Clean Build target -->
 	<target name="clean-build" description="Cleans the build directory">
diff --git a/google-examples/README.txt b/google-taglib/google-examples/README.txt
similarity index 100%
rename from google-examples/README.txt
rename to google-taglib/google-examples/README.txt
diff --git a/google-examples/WEB-INF/web.xml b/google-taglib/google-examples/WEB-INF/web.xml
similarity index 100%
rename from google-examples/WEB-INF/web.xml
rename to google-taglib/google-examples/WEB-INF/web.xml
diff --git a/google-examples/advanced.html b/google-taglib/google-examples/advanced.html
similarity index 100%
rename from google-examples/advanced.html
rename to google-taglib/google-examples/advanced.html
diff --git a/google-examples/advanced.jsp b/google-taglib/google-examples/advanced.jsp
similarity index 100%
rename from google-examples/advanced.jsp
rename to google-taglib/google-examples/advanced.jsp
diff --git a/google-examples/cache.html b/google-taglib/google-examples/cache.html
similarity index 100%
rename from google-examples/cache.html
rename to google-taglib/google-examples/cache.html
diff --git a/google-examples/cache.jsp b/google-taglib/google-examples/cache.jsp
similarity index 100%
rename from google-examples/cache.jsp
rename to google-taglib/google-examples/cache.jsp
diff --git a/google-examples/index.html b/google-taglib/google-examples/index.html
similarity index 100%
rename from google-examples/index.html
rename to google-taglib/google-examples/index.html
diff --git a/google-examples/key.html b/google-taglib/google-examples/key.html
similarity index 100%
rename from google-examples/key.html
rename to google-taglib/google-examples/key.html
diff --git a/google-examples/key.jsp b/google-taglib/google-examples/key.jsp
similarity index 100%
rename from google-examples/key.jsp
rename to google-taglib/google-examples/key.jsp
diff --git a/google-examples/search.html b/google-taglib/google-examples/search.html
similarity index 100%
rename from google-examples/search.html
rename to google-taglib/google-examples/search.html
diff --git a/google-examples/search.jsp b/google-taglib/google-examples/search.jsp
similarity index 100%
rename from google-examples/search.jsp
rename to google-taglib/google-examples/search.jsp
diff --git a/google-examples/spelling.html b/google-taglib/google-examples/spelling.html
similarity index 100%
rename from google-examples/spelling.html
rename to google-taglib/google-examples/spelling.html
diff --git a/google-examples/spelling.jsp b/google-taglib/google-examples/spelling.jsp
similarity index 100%
rename from google-examples/spelling.jsp
rename to google-taglib/google-examples/spelling.jsp
diff --git a/htdocs/about.html b/google-taglib/htdocs/about.html
similarity index 83%
rename from htdocs/about.html
rename to google-taglib/htdocs/about.html
index 2c81905..d274d20 100644
--- a/htdocs/about.html
+++ b/google-taglib/htdocs/about.html
@@ -23,39 +23,35 @@ body,td,font,p,a{font-family:arial,sans-serif}
 <table border="0" cellpadding="0" cellspacing="0" width="95%">
 	<tr>
 		<td width="143" valign="top">
+			<p>
 			<small><br>
 			&nbsp;&nbsp;<a href="index.html">Overview</a> <br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
 			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
-			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
-			&nbsp;&nbsp;<a href="uml.html">UML</a></br>
 			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#cc9900">About</font></b> 
 			</small>
+			</p>
 			<img width="145" height="0" alt="">
-			<p>
 			<table cellpadding="1" width="120">
 				<tr>
 					<td style="background-color: #efefef"><small>
-						<div class="sidesearch">
-							<form action="http://www.thauvin.net/gtlib-search/search.jsp" method="post">
+						<!-- <div class="sidesearch">
+							<form action="http://googlesite.google.com/search" method="get">
 								<div align="center">
-									<font size="-2">
+									<font size="-2"><input type="hidden" name="output" value="googleabout"><input type="hidden" name="site" value="googlesite">
 									<i>Find on this site:</i><br>
 									<input type="text" name="q" size="10"><br><input type="submit" value="Search" name="submit">
 									<br>
 									</font>
 								</div>
 							</form>
-						</div>
+						</div> -->
 						</small>
 					</td>
 				</tr>
 			</table>
-			<p>
-			&nbsp;<a href="http://sourceforge.net/projects/google-taglib"><img src="http://sourceforge.net/sflogo.php?group_id=9044&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"/></a>
-			</p>
 		</td>
 		<td style="background-color: #cccccc" width="1" valign="top"><img alt="" width="1" height="1"></td>
 		<td style="background-color: #ffffff" width="10" valign="top"><img alt="" width="1" height="1"></td>
@@ -75,12 +71,11 @@ body,td,font,p,a{font-family:arial,sans-serif}
 				<li>
 					<a href="http://www.postneo.com/">Matt Croydon</a> 
 				</li>
+				<!--
 				<li>
 					<a href="http://www.dynamicobjects.com/d2r/">Diego Doval</a> 
 				</li>
-				<li>
-					<a href="http://www.jroller.com/page/arjunram/">Arjun Ram</a>
-				</li>
+				-->
 			</ul>
 			</font>
 			<p>
diff --git a/htdocs/docs.html b/google-taglib/htdocs/docs.html
similarity index 94%
rename from htdocs/docs.html
rename to google-taglib/htdocs/docs.html
index 0e57832..3fd90bd 100644
--- a/htdocs/docs.html
+++ b/google-taglib/htdocs/docs.html
@@ -28,38 +28,35 @@ code {font-size:10pt}
 <table border="0" cellpadding="0" cellspacing="0" width="95%">
 	<tr>
 		<td width="143" valign="top">
+			<p>
 			<small><br>
 			&nbsp;&nbsp;<a href="index.html">Overview</a> <br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
-			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">Documentation</font></b><br>
+			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">Documentation</font></b>
+			<br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
 			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
-			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
-			&nbsp;&nbsp;<a href="uml.html">UML</a></br>
 			&nbsp;&nbsp;<a href="about.html">About</a> </small>
+			</p>
 			<img width="145" height="0" alt="">
-			<p>
 			<table cellpadding="1" width="120">
 				<tr>
 					<td style="background-color: #efefef"><small>
-						<div class="sidesearch">
-							<form action="http://www.thauvin.net/gtlib-search/search.jsp" method="post">
+						<!-- <div class="sidesearch">
+							<form action="http://googlesite.google.com/search" method="get">
 								<div align="center">
-									<font size="-2">
+									<font size="-2"><input type="hidden" name="output" value="googleabout"><input type="hidden" name="site" value="googlesite">
 									<i>Find on this site:</i><br>
 									<input type="text" name="q" size="10"><br><input type="submit" value="Search" name="submit">
 									<br>
 									</font>
 								</div>
 							</form>
-						</div>
+						</div> -->
 						</small>
 					</td>
 				</tr>
 			</table>
-			<p>
-			&nbsp;<a href="http://sourceforge.net/projects/google-taglib"><img src="http://sourceforge.net/sflogo.php?group_id=9044&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"/></a>
-			</p>
 		</td>
 		<td style="background-color: #cccccc" width="1" valign="top"><img alt="" width="1" height="1"></td>
 		<td style="background-color: #ffffff" width="10" valign="top"><img alt="" width="1" height="1"></td>
@@ -430,22 +427,13 @@ code {font-size:10pt}
 					<tr>
 						<td>
 							<div align="center">
-								<font size="-1"><a name="2_1_site"><b>site</b></a></font>
+								<font size="-1"><b>site</b></font>
 							</div>
 						</td>
-						<td><font size="-1">Restricts the search to documents  within the specified
+						<td><font size="-1">Restricts the search to documents  within the specfied
 						site.</font></td>
 						<td>&nbsp;</td>
 					</tr>
-					<tr>
-						<td>
-							<div align="center">
-								<font size="-1"><a name="2_1_filetype"><b>type</b></a></font>
-							</div>
-						</td>
-						<td><font size="-1">Specifies the <a href="http://www.google.com/help/faq_filetypes.html">file type</a> to be searched. (e.g.: pdf)</font></td>
-						<td>&nbsp;</td>
-					</tr>
 				</table>
 				<p>
 				<font size="-1">For detailed information on the above Google search options, 
@@ -678,9 +666,12 @@ code {font-size:10pt}
 				</table>
 				<p>
 				<font size="-1">The <code>&lt;google:next/&gt;</code> tag is used to
+
+
 				used to display a link to more search results.<br>
 				The <code>&lt;google:previous/&gt;</code> tag is used to used to display a link 
 				to previous search results.</font>
+
 				<p>
 				<font size="-1"><strong>Tag Syntax</strong></font>
 				<p>
@@ -739,8 +730,11 @@ code {font-size:10pt}
 					</tr>
 				</table>
 				<p>
-				<font size="-1">The <code>&lt;google:searchComments/&gt;</code> 
-				tag is used to display the comments (if any) included with the current result set.</font>
+				<font size="-1"></font> <font size="-1">The <code>&lt;google:searchComments/&gt;</code> 
+				tag is used to
+
+
+				display the comments (if any) included with the current result set.</font>
 				<p>
 				<a name="2_8" id="2_8"></a>
 
@@ -752,15 +746,14 @@ code {font-size:10pt}
 					</tr>
 				</table>
 				<p>
-				<font size="-1">The <code>&lt;google:searchQuery/&gt;</code> tag is used to display
-				the text of the current query.
+				<font size="-1"></font> <font size="-1">The <code>&lt;google:searchQuery/&gt;</code> 
+				tag is used to
+
+
+				display the text of the current query.
+
 				</font>
 				<p>
-				<font size="-1">The specified search keywords (or phrase) are returned by default.
-				To display the full query (including preset <a href="#2_1_site">site</a> and
-				<a href="#2_1_filetype">file type</a> options), set the <code>type</code> attribute
-				to <code>full</a>.</font>
-				<p>
 				<a name="2_9" id="2_9"></a>
 
 				<table bgcolor="#fff9e4" cellpadding="2" width="100%" border="0">
@@ -771,9 +764,12 @@ code {font-size:10pt}
 					</tr>
 				</table>
 				<p>
-				<font size="-1">The <code>&lt;google:searchTime/&gt;</code> 
-				tag is used to display the total server time used to return the search results,
-				measured in seconds.</font>
+				<font size="-1"></font> <font size="-1">The <code>&lt;google:searchTime/&gt;</code> 
+				tag is used to
+
+
+				display the total server time used to return the search results, measured in 
+				seconds.</font>
 				<p>
 				<a name="2_10" id="2_10"></a>
 
@@ -785,9 +781,11 @@ code {font-size:10pt}
 					</tr>
 				</table>
 				<p>
-				<font size="-1">The <code>&lt;google:searchTips/&gt;</code> 
-				tag is used to display the tips (if any) included with the current result
-				set.</font>
+				<font size="-1"></font> <font size="-1">The <code>&lt;google:searchTips/&gt;</code> 
+				tag is used to
+
+
+				display the tips (if any) included with the current result set.</font>
 			</blockquote>
 			<p>
 			<a name="cached" id="cached"></a>
diff --git a/htdocs/howto.html b/google-taglib/htdocs/howto.html
similarity index 95%
rename from htdocs/howto.html
rename to google-taglib/htdocs/howto.html
index 3b37d62..ca6ec0d 100644
--- a/htdocs/howto.html
+++ b/google-taglib/htdocs/howto.html
@@ -27,38 +27,35 @@ body,td,font,.p,a{font-family:arial,sans-serif}
 <table border="0" cellpadding="0" cellspacing="0" width="95%">
 	<tr>
 		<td width="143" valign="top">
+			<p>
 			<small><br>
 			&nbsp;&nbsp;<a href="index.html">Overview</a> <br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
-			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">HowTo</font></b><br>
-			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a><br>
-			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
-			&nbsp;&nbsp;<a href="uml.html">UML</a></br>
+			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">HowTo</font></b>
+			<br>
+			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
 			&nbsp;&nbsp;<a href="about.html">About</a> </small>
+			</p>
 			<img alt="" width="143" height="0">
-			<p>
 			<table cellpadding="1" width="120">
 				<tr>
 					<td style="background-color: #efefef"><small>
-						<div class="sidesearch">
-							<form action="http://www.thauvin.net/gtlib-search/search.jsp" method="post">
+						<!-- <div class="sidesearch">
+							<form action="http://googlesite.google.com/search" method="get">
 								<div align="center">
-									<font size="-2">
-									<i>Find on this site:</i><br>
+									<font size="-2"><input type="hidden" name="output" value="googleabout"><input type="hidden" name="site" value="googlesite">
+									<i>Find on this site:</i> <br>
 									<input type="text" name="q" size="10"><br><input type="submit" value="Search" name="submit">
 									<br>
 									</font>
 								</div>
 							</form>
-						</div>
+						</div> -->
 						</small>
 					</td>
 				</tr>
 			</table>
-			<p>
-			&nbsp;<a href="http://sourceforge.net/projects/google-taglib"><img src="http://sourceforge.net/sflogo.php?group_id=9044&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"/></a>
-			</p>
 		</td>
 		<td style="background-color: #cccccc" width="1" valign="top"><img alt="" width="1" height="1"></td>
 		<td style="background-color: #ffffff" width="10" valign="top"><img alt="" width="1" height="1"></td>
@@ -74,7 +71,7 @@ body,td,font,.p,a{font-family:arial,sans-serif}
 			</table>
 			<p>
 			<font size="-1"><b>&nbsp; &nbsp; 1. <a href="#search">Search &amp; Display the 
-			Results of a Google Search</a></b> </font>
+			Results of a Goggle Search</a></b> </font>
 			<blockquote>
 				<font size="-1">1.1 <a href="#1_1">Create a Search Form </a> <br>
 				1.2 <a href="#1_2">Create a Result Page</a> <br>
@@ -82,7 +79,7 @@ body,td,font,.p,a{font-family:arial,sans-serif}
 			</blockquote>
 			<font size="-1">
 			<p>
-			<b>&nbsp; &nbsp; 2. <a href="#cached">Display a Page Cached by Google</a></b> </font>
+			<b>&nbsp; &nbsp; 2. <a href="#cached">Display a Page Cached by Goggle</a></b> </font>
 			<blockquote>
 				<font size="-1">2.1 <a href="#2_1">Create a Search From </a> <br>
 				2.2 <a href="#2_2">Create a Result Page</a> <br>
@@ -91,7 +88,7 @@ body,td,font,.p,a{font-family:arial,sans-serif}
 			<font size="-1">
 			<p>
 			</p>
-			<b>&nbsp; &nbsp; 3. <a href="#spelling">Display a Google Spelling Suggestion </a></b></font>
+			<b>&nbsp; &nbsp; 3. <a href="#spelling">Display a Goggle Spelling Suggestion </a></b></font>
 			<blockquote>
 				<font size="-1">3.1 <a href="#3_1">Create a Search Form</a> <br>
 				3.2 <a href="#3_2">Create a Result Page </a> <br>
diff --git a/htdocs/images/arrow.gif b/google-taglib/htdocs/images/arrow.gif
similarity index 100%
rename from htdocs/images/arrow.gif
rename to google-taglib/htdocs/images/arrow.gif
diff --git a/htdocs/images/arrow.jpg b/google-taglib/htdocs/images/arrow.jpg
similarity index 100%
rename from htdocs/images/arrow.jpg
rename to google-taglib/htdocs/images/arrow.jpg
diff --git a/htdocs/images/cached.jpg b/google-taglib/htdocs/images/cached.jpg
similarity index 100%
rename from htdocs/images/cached.jpg
rename to google-taglib/htdocs/images/cached.jpg
diff --git a/htdocs/images/cachedresults.jpg b/google-taglib/htdocs/images/cachedresults.jpg
similarity index 100%
rename from htdocs/images/cachedresults.jpg
rename to google-taglib/htdocs/images/cachedresults.jpg
diff --git a/htdocs/images/duktumbl.gif b/google-taglib/htdocs/images/duktumbl.gif
similarity index 100%
rename from htdocs/images/duktumbl.gif
rename to google-taglib/htdocs/images/duktumbl.gif
diff --git a/htdocs/images/duktumbl.png b/google-taglib/htdocs/images/duktumbl.png
similarity index 100%
rename from htdocs/images/duktumbl.png
rename to google-taglib/htdocs/images/duktumbl.png
diff --git a/htdocs/images/google_sm.gif b/google-taglib/htdocs/images/google_sm.gif
similarity index 100%
rename from htdocs/images/google_sm.gif
rename to google-taglib/htdocs/images/google_sm.gif
diff --git a/htdocs/images/google_sm.png b/google-taglib/htdocs/images/google_sm.png
similarity index 100%
rename from htdocs/images/google_sm.png
rename to google-taglib/htdocs/images/google_sm.png
diff --git a/htdocs/images/search.jpg b/google-taglib/htdocs/images/search.jpg
similarity index 100%
rename from htdocs/images/search.jpg
rename to google-taglib/htdocs/images/search.jpg
diff --git a/htdocs/images/searchresults.jpg b/google-taglib/htdocs/images/searchresults.jpg
similarity index 100%
rename from htdocs/images/searchresults.jpg
rename to google-taglib/htdocs/images/searchresults.jpg
diff --git a/htdocs/images/spelling.jpg b/google-taglib/htdocs/images/spelling.jpg
similarity index 100%
rename from htdocs/images/spelling.jpg
rename to google-taglib/htdocs/images/spelling.jpg
diff --git a/htdocs/images/yellowarrow.gif b/google-taglib/htdocs/images/yellowarrow.gif
similarity index 100%
rename from htdocs/images/yellowarrow.gif
rename to google-taglib/htdocs/images/yellowarrow.gif
diff --git a/htdocs/includes/google.css b/google-taglib/htdocs/includes/google.css
similarity index 100%
rename from htdocs/includes/google.css
rename to google-taglib/htdocs/includes/google.css
diff --git a/htdocs/index.html b/google-taglib/htdocs/index.html
similarity index 93%
rename from htdocs/index.html
rename to google-taglib/htdocs/index.html
index 80ce6d9..4af3e52 100644
--- a/htdocs/index.html
+++ b/google-taglib/htdocs/index.html
@@ -22,39 +22,36 @@ body,td,font,p,a{font-family:arial,sans-serif}
 <table border="0" cellpadding="0" cellspacing="0" width="95%">
 	<tr>
 		<td width="143" valign="top">
+			<p>
 			<small><br>
 			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#CC9900">Overview</font></b>
 			<br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
-			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a><br>
-			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
-			&nbsp;&nbsp;<a href="uml.html">UML</a></br>
+			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
 			&nbsp;&nbsp;<a href="about.html">About</a> </small>
+			</p>
 			<img alt="" width="143" height="0">
-			<p>
 			<table cellpadding="1" width="120">
 				<tr>
 					<td style="background-color: #efefef"><small>
-						<div class="sidesearch">
-							<form action="http://www.thauvin.net/gtlib-search/search.jsp" method="post">
+						<!-- <div class="sidesearch">
+							<form action="http://googlesite.google.com/search" method="get">
 								<div align="center">
-									<font size="-2">
-									<i>Find on this site:</i><br>
+									<font size="-2"><input type="hidden" name="output" value="googleabout"><input type="hidden" name="site" value="googlesite">
+									<i>Find on this site:</i> <br>
 									<input type="text" name="q" size="10"><br><input type="submit" value="Search" name="submit">
 									<br>
 									</font>
 								</div>
 							</form>
-						</div>
+						</div> -->
 						</small>
 					</td>
 				</tr>
 			</table>
 			<p>
-			&nbsp;<a href="http://www.jars.com" target="_blank"><img src="images/jars25.gif" alt="Rated Jars Top 25%" border="0"></a>
-			<p>
 			&nbsp;<a href="http://sourceforge.net/projects/google-taglib"><img src="http://sourceforge.net/sflogo.php?group_id=9044&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"/></a>
 			</p>
 		</td>
@@ -82,8 +79,12 @@ body,td,font,p,a{font-family:arial,sans-serif}
 									The <a href="http://sourceforge.net/project/showfiles.php?group_id=90444">download</a> includes the tag library and associated TLD.</font></td>
 							</tr>
 							<tr>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
+								<td>&nbsp;
+
+								</td>
+								<td>&nbsp;
+
+								</td>
 							</tr>
 							<tr>
 								<td style="background-color: #FFEBAE"><font face="arial,sans-serif" size="5"><b>2</b></font></td>
@@ -92,8 +93,12 @@ body,td,font,p,a{font-family:arial,sans-serif}
 									a license key</a>.</font></td>
 							</tr>
 							<tr>
-								<td>&nbsp;</td>
-								<td>&nbsp;</td>
+								<td>&nbsp;
+
+								</td>
+								<td>&nbsp;
+
+								</td>
 							</tr>
 							<tr>
 								<td style="background-color: #FFEBAE"><font size="5"><b>3</b></font></td>
@@ -109,7 +114,7 @@ body,td,font,p,a{font-family:arial,sans-serif}
 								<tr>
 									<td>
 										<div align="center">
-											<img src="images/duktumbl.gif" width="130" height="80" alt="Tumbling Duke" hspace="5">
+											<img src="images/duktumbl.gif" width="130" height="80" alt="Google Web APIs" hspace="5">
 										</div>
 									</td>
 								</tr>
diff --git a/htdocs/license.html b/google-taglib/htdocs/license.html
similarity index 89%
rename from htdocs/license.html
rename to google-taglib/htdocs/license.html
index 33a5005..64a9539 100644
--- a/htdocs/license.html
+++ b/google-taglib/htdocs/license.html
@@ -22,39 +22,35 @@ body,td,font,p,a{font-family:arial,sans-serif}
 <table border="0" cellpadding="0" cellspacing="0" width="95%">
 	<tr>
 		<td width="143" valign="top">
+			<p>
 			<small><br>
 			&nbsp;&nbsp;<a href="index.html">Overview</a> <br>
 			&nbsp;&nbsp;<a href="http://sourceforge.net/project/showfiles.php?group_id=90444">Download</a> <br>
 			&nbsp;&nbsp;<a href="docs.html">Documentation</a> <br>
 			&nbsp;&nbsp;<a href="howto.html">HowTo</a> <br>
 			&nbsp;&nbsp;<a href="javadoc/index.html">Javadoc</a> <br>
-			&nbsp;&nbsp;<a href="tlddoc/index.html">TLD</a><br>
-			&nbsp;&nbsp;<a href="uml.html">UML</a></br>
 			<img src="images/yellowarrow.gif" alt="arrow" width="4" height="8"><b>&nbsp;<font color="#cc9900">About</font></b>
 			</small>
+			</p>
 			<img width="145" height="0" alt="">
-			<p>
 			<table cellpadding="1" width="120">
 				<tr>
 					<td style="background-color: #efefef"><small>
-						<div class="sidesearch">
-							<form action="http://www.thauvin.net/gtlib-search/search.jsp" method="post">
+						<!-- <div class="sidesearch">
+							<form action="http://googlesite.google.com/search" method="get">
 								<div align="center">
-									<font size="-2">
+									<font size="-2"><input type="hidden" name="output" value="googleabout"><input type="hidden" name="site" value="googlesite">
 									<i>Find on this site:</i><br>
 									<input type="text" name="q" size="10"><br><input type="submit" value="Search" name="submit">
 									<br>
 									</font>
 								</div>
 							</form>
-						</div>
+						</div> -->
 						</small>
 					</td>
 				</tr>
 			</table>
-			<p>
-			&nbsp;<a href="http://sourceforge.net/projects/google-taglib"><img src="http://sourceforge.net/sflogo.php?group_id=9044&amp;type=1" width="88" height="31" border="0" alt="SourceForge.net Logo"/></a>
-			</p>
 		</td>
 		<td style="background-color: #cccccc" width="1" valign="top"><img alt="" width="1" height="1"></td>
 		<td style="background-color: #ffffff" width="10" valign="top"><img alt="" width="1" height="1"></td>
diff --git a/lib/doccheck.jar b/google-taglib/lib/doccheck.jar
similarity index 100%
rename from lib/doccheck.jar
rename to google-taglib/lib/doccheck.jar
diff --git a/lib/googleapi.jar b/google-taglib/lib/googleapi.jar
similarity index 100%
rename from lib/googleapi.jar
rename to google-taglib/lib/googleapi.jar
diff --git a/lib/servlet.jar b/google-taglib/lib/servlet.jar
similarity index 100%
rename from lib/servlet.jar
rename to google-taglib/lib/servlet.jar
diff --git a/licenses/LICENSE-activation.txt b/google-taglib/licenses/LICENSE-activation.txt
similarity index 100%
rename from licenses/LICENSE-activation.txt
rename to google-taglib/licenses/LICENSE-activation.txt
diff --git a/licenses/LICENSE-apache-soap.txt b/google-taglib/licenses/LICENSE-apache-soap.txt
similarity index 100%
rename from licenses/LICENSE-apache-soap.txt
rename to google-taglib/licenses/LICENSE-apache-soap.txt
diff --git a/licenses/LICENSE-crimson.txt b/google-taglib/licenses/LICENSE-crimson.txt
similarity index 100%
rename from licenses/LICENSE-crimson.txt
rename to google-taglib/licenses/LICENSE-crimson.txt
diff --git a/licenses/LICENSE-doccheck.html b/google-taglib/licenses/LICENSE-doccheck.html
similarity index 100%
rename from licenses/LICENSE-doccheck.html
rename to google-taglib/licenses/LICENSE-doccheck.html
diff --git a/licenses/LICENSE-google.txt b/google-taglib/licenses/LICENSE-google.txt
similarity index 100%
rename from licenses/LICENSE-google.txt
rename to google-taglib/licenses/LICENSE-google.txt
diff --git a/licenses/LICENSE-javamail.txt b/google-taglib/licenses/LICENSE-javamail.txt
similarity index 100%
rename from licenses/LICENSE-javamail.txt
rename to google-taglib/licenses/LICENSE-javamail.txt
diff --git a/licenses/LICENSE.txt b/google-taglib/licenses/LICENSE.txt
similarity index 100%
rename from licenses/LICENSE.txt
rename to google-taglib/licenses/LICENSE.txt
diff --git a/src/net/thauvin/google/GoogleSearchBean.java b/google-taglib/src/net/thauvin/google/GoogleSearchBean.java
similarity index 96%
rename from src/net/thauvin/google/GoogleSearchBean.java
rename to google-taglib/src/net/thauvin/google/GoogleSearchBean.java
index 9178600..eca459b 100644
--- a/src/net/thauvin/google/GoogleSearchBean.java
+++ b/google-taglib/src/net/thauvin/google/GoogleSearchBean.java
@@ -50,7 +50,7 @@ import java.net.URLEncoder;
  *
  * @author Erik C. Thauvin
  * @created April 25, 2002
- * @version $Revision$, $Date$
+ * @version $Revision$
  * @since 1.0
  */
 public class GoogleSearchBean
@@ -95,13 +95,6 @@ public class GoogleSearchBean
 	 */
 	public static final int DEFAULT_START = 0;
 
-	/**
-	 * The default filetype.
-	 * 
-	 * @since 1.0.1
-	 */
-	public static final String DEFAULT_TYPE = "";
-
 	/**
 	 * The <em>next</em> keyword.
 	 */
@@ -117,7 +110,6 @@ public class GoogleSearchBean
 		"The authorization key has not been specified.";
 	private GoogleSearch service = null;
 	private GoogleSearchResult result = null;
-	private String keywords = null;
 	private GoogleSearchResultElement elements[] = null;
 	private boolean keySet = false;
 	private int maxResults = 10;
@@ -171,30 +163,6 @@ public class GoogleSearchBean
 		return keySet;
 	}
 
-	/**
-	 * Sets the search keywords.
-	 *
-	 * @param keywords The keywords
-	 * @see #getKeywords()
-	 * @since 1.0.1
-	 */
-	public final void setKeywords(String keywords)
-	{
-		this.keywords = keywords;
-	}
-
-	/**
-	 * Returns the keywords.
-	 *
-	 * @return The keywords value.
-	 * @see #setKeywords(String)
-	 * @since 1.0.1
-	 */
-	public final String getKeywords()
-	{
-		return this.keywords;
-	}
-
 	/**
 	 * Sets the HTTP proxy host, port, user name and password.
 	 *
@@ -605,10 +573,6 @@ public class GoogleSearchBean
 			{
 				return String.valueOf(result.getDocumentFiltering());
 			}
-			else if (property.equalsIgnoreCase("searchKeywords"))
-			{
-				return getKeywords();
-			}
 			else if (property.equalsIgnoreCase("searchQuery"))
 			{
 				return result.getSearchQuery();
diff --git a/src/net/thauvin/google/TagUtility.java b/google-taglib/src/net/thauvin/google/TagUtility.java
similarity index 99%
rename from src/net/thauvin/google/TagUtility.java
rename to google-taglib/src/net/thauvin/google/TagUtility.java
index 8feadd2..20e56b2 100644
--- a/src/net/thauvin/google/TagUtility.java
+++ b/google-taglib/src/net/thauvin/google/TagUtility.java
@@ -147,11 +147,6 @@ public class TagUtility
 	 */
 	public static final String START_PARAM = "start";
 
-	/**
-	 * The name of the (file) type request parameter.
-	 */
-	public static final String TYPE_PARAM = "type";
-
 	/**
 	 * Protected constructor to disable instantiation.
 	 */
diff --git a/src/net/thauvin/google/package.html b/google-taglib/src/net/thauvin/google/package.html
similarity index 100%
rename from src/net/thauvin/google/package.html
rename to google-taglib/src/net/thauvin/google/package.html
diff --git a/src/net/thauvin/google/taglibs/CachedPage.java b/google-taglib/src/net/thauvin/google/taglibs/CachedPage.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/CachedPage.java
rename to google-taglib/src/net/thauvin/google/taglibs/CachedPage.java
diff --git a/src/net/thauvin/google/taglibs/Element.java b/google-taglib/src/net/thauvin/google/taglibs/Element.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Element.java
rename to google-taglib/src/net/thauvin/google/taglibs/Element.java
diff --git a/src/net/thauvin/google/taglibs/EndIndex.java b/google-taglib/src/net/thauvin/google/taglibs/EndIndex.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/EndIndex.java
rename to google-taglib/src/net/thauvin/google/taglibs/EndIndex.java
diff --git a/src/net/thauvin/google/taglibs/EstimatedTotal.java b/google-taglib/src/net/thauvin/google/taglibs/EstimatedTotal.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/EstimatedTotal.java
rename to google-taglib/src/net/thauvin/google/taglibs/EstimatedTotal.java
diff --git a/src/net/thauvin/google/taglibs/KeySupport.java b/google-taglib/src/net/thauvin/google/taglibs/KeySupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/KeySupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/KeySupport.java
diff --git a/src/net/thauvin/google/taglibs/Next.java b/google-taglib/src/net/thauvin/google/taglibs/Next.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Next.java
rename to google-taglib/src/net/thauvin/google/taglibs/Next.java
diff --git a/src/net/thauvin/google/taglibs/Previous.java b/google-taglib/src/net/thauvin/google/taglibs/Previous.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Previous.java
rename to google-taglib/src/net/thauvin/google/taglibs/Previous.java
diff --git a/src/net/thauvin/google/taglibs/QuerySupport.java b/google-taglib/src/net/thauvin/google/taglibs/QuerySupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/QuerySupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/QuerySupport.java
diff --git a/src/net/thauvin/google/taglibs/Search.java b/google-taglib/src/net/thauvin/google/taglibs/Search.java
similarity index 85%
rename from src/net/thauvin/google/taglibs/Search.java
rename to google-taglib/src/net/thauvin/google/taglibs/Search.java
index 9a3f9ba..be161e5 100644
--- a/src/net/thauvin/google/taglibs/Search.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/Search.java
@@ -42,26 +42,26 @@ import net.thauvin.google.TagUtility;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.PageContext;
 
+
 /**
  * A custom tag used to perform Google searches.
  *
  * @author Erik C. Thauvin
  * @created April 25, 2002
- * @version $Revision$, $Date$
+ * @version $Revision$
  * @since 1.0
  */
 public class Search extends QuerySupport
 {
 	private GoogleSearchBean bean = null;
+	private String lr = GoogleSearchBean.DEFAULT_LR;
+	private String restrict = GoogleSearchBean.DEFAULT_RESTRICT;
+	private String site = GoogleSearchBean.DEFAULT_SITE;
 	private boolean cache = GoogleSearchBean.DEFAULT_CACHE;
 	private boolean filter = GoogleSearchBean.DEFAULT_FILTER;
-	private String lr = GoogleSearchBean.DEFAULT_LR;
-	private int maxResults = GoogleSearchBean.DEFAULT_MAX_RESULTS;
-	private String restrict = GoogleSearchBean.DEFAULT_RESTRICT;
 	private boolean safeSearch = GoogleSearchBean.DEFAULT_SAFE_SEARCH;
-	private String site = GoogleSearchBean.DEFAULT_SITE;
+	private int maxResults = GoogleSearchBean.DEFAULT_MAX_RESULTS;
 	private int start = GoogleSearchBean.DEFAULT_START;
-	private String type = GoogleSearchBean.DEFAULT_TYPE;
 
 	/**
 	 * Sets the cache attribute.
@@ -106,7 +106,7 @@ public class Search extends QuerySupport
 		}
 		catch (NumberFormatException e)
 		{
-			;// Do nothing
+			; // Do nothing
 		}
 	}
 
@@ -153,19 +153,116 @@ public class Search extends QuerySupport
 		}
 		catch (NumberFormatException e)
 		{
-			;// Do nothing
+			; // Do nothing
 		}
 	}
 
 	/**
-	 * Sets the (file) type attribute.
+	 * doEndTag method.
 	 *
-	 * @param type The new attribute value.
-	 * @since 1.0.1
+	 * @return EVAL_PAGE
+	 * @exception JspException
 	 */
-	public final void setType(String type)
+	public int doEndTag()
+				 throws JspException
 	{
-		this.type = type;
+		final String query = getQuery();
+
+		if (TagUtility.isValidString(query, true))
+		{
+			try
+			{
+				bean.setProxyServer(pageContext.getServletContext()
+											   .getInitParameter(TagUtility.GOOGLE_PROXY_HOST),
+									pageContext.getServletContext()
+											   .getInitParameter(TagUtility.GOOGLE_PROXY_PORT),
+									pageContext.getServletContext()
+											   .getInitParameter(TagUtility.GOOGLE_PROXY_USERNAME),
+									pageContext.getServletContext()
+											   .getInitParameter(TagUtility.GOOGLE_PROXY_PASSWORD));
+
+				bean.getGoogleSearch(getKey(), getSite() + getQuery(),
+									 getStart(), getMaxResults(), getFilter(),
+									 getRestrict(), getSafeSearch(), getLr());
+			}
+			catch (Exception e)
+			{
+				throw TagUtility.outputError("search", e);
+			}
+		}
+		else if (!getCache())
+		{
+			bean.reset();
+		}
+
+		// Reset the values
+		reset();
+
+		return EVAL_PAGE;
+	}
+
+	/**
+	 * doStartTag method.
+	 *
+	 * @return EVAL_BODY_TAG.
+	 * @exception JspException
+	 */
+	public int doStartTag()
+				   throws JspException
+	{
+		// Get the Google bean
+		bean = TagUtility.getGoogleSearchBean(pageContext);
+
+		// Create a new bean if it doesn't exists
+		if (bean == null)
+		{
+			try
+			{
+				bean = new GoogleSearchBean();
+
+				// Set the bean as named session attribute
+				pageContext.setAttribute(TagUtility.GOOGLE_SEARCH_BEAN, bean,
+										 PageContext.SESSION_SCOPE);
+			}
+			catch (Exception e)
+			{
+				throw new JspException("An unknown error ocurred while creating the Google search bean.");
+			}
+		}
+
+		return EVAL_BODY_TAG;
+	}
+
+	/**
+	 * Release method.
+	 */
+	public void release()
+	{
+		super.release();
+
+		// Reset all attributes
+		start = GoogleSearchBean.DEFAULT_START;
+		maxResults = GoogleSearchBean.DEFAULT_MAX_RESULTS;
+		filter = GoogleSearchBean.DEFAULT_FILTER;
+		safeSearch = GoogleSearchBean.DEFAULT_SAFE_SEARCH;
+		restrict = GoogleSearchBean.DEFAULT_RESTRICT;
+		lr = GoogleSearchBean.DEFAULT_LR;
+		site = GoogleSearchBean.DEFAULT_SITE;
+		cache = GoogleSearchBean.DEFAULT_CACHE;
+
+		// Reset the bean
+		bean = null;
+
+		// Reset the values
+		reset();
+	}
+
+	/**
+	 * Reset the values.
+	 */
+	protected void reset()
+	{
+		super.reset();
 	}
 
 	/**
@@ -255,23 +352,6 @@ public class Search extends QuerySupport
 		return getIntParam(TagUtility.START_PARAM, start);
 	}
 
-	/**
-	 * Returns the (file) type attribute.
-	 *
-	 * @return The attribute value
-	 */
-	private final String getType()
-	{
-		String type = getStringParam(TagUtility.TYPE_PARAM, this.type);
-
-		if (type.length() > 0)
-		{
-			return (" filetype:" + type);
-		}
-
-		return "";
-	}
-
 	/**
 	 * Converts a request parameter to a boolean.
 	 *
@@ -282,7 +362,7 @@ public class Search extends QuerySupport
 	private boolean getBoolParam(String paramName, boolean defaultValue)
 	{
 		String param =
-				TagUtility.getParameter(pageContext.getRequest(), paramName);
+			TagUtility.getParameter(pageContext.getRequest(), paramName);
 
 		if (TagUtility.isValidString(param, true))
 		{
@@ -302,7 +382,7 @@ public class Search extends QuerySupport
 	private int getIntParam(String paramName, int defaultValue)
 	{
 		String param =
-				TagUtility.getParameter(pageContext.getRequest(), paramName);
+			TagUtility.getParameter(pageContext.getRequest(), paramName);
 
 		if (TagUtility.isValidString(param, true))
 		{
@@ -312,7 +392,7 @@ public class Search extends QuerySupport
 			}
 			catch (NumberFormatException e)
 			{
-				;// Do nothing
+				; // Do nothing
 			}
 		}
 
@@ -329,7 +409,7 @@ public class Search extends QuerySupport
 	private String getStringParam(String paramName, String defaultValue)
 	{
 		String param =
-				TagUtility.getParameter(pageContext.getRequest(), paramName);
+			TagUtility.getParameter(pageContext.getRequest(), paramName);
 
 		if (TagUtility.isValidString(param, true))
 		{
@@ -338,115 +418,4 @@ public class Search extends QuerySupport
 
 		return defaultValue;
 	}
-
-	/**
-	 * doEndTag method.
-	 *
-	 * @return EVAL_PAGE
-	 * @exception JspException
-	 */
-	public int doEndTag()
-		throws JspException
-	{
-		final String query = getQuery();
-
-		if (TagUtility.isValidString(query, true))
-		{
-			try
-			{
-				bean.setProxyServer(pageContext.getServletContext()
-						.getInitParameter(TagUtility.GOOGLE_PROXY_HOST),
-						pageContext.getServletContext()
-						.getInitParameter(TagUtility.GOOGLE_PROXY_PORT),
-						pageContext.getServletContext()
-						.getInitParameter(TagUtility.GOOGLE_PROXY_USERNAME),
-						pageContext.getServletContext()
-						.getInitParameter(TagUtility.GOOGLE_PROXY_PASSWORD));
-
-                bean.setKeywords(getQuery());
-                
-				bean.getGoogleSearch(getKey(), getSite() + getQuery() + getType(),
-						getStart(), getMaxResults(), getFilter(),
-						getRestrict(), getSafeSearch(), getLr());
-			}
-			catch (Exception e)
-			{
-				throw TagUtility.outputError("search", e);
-			}
-		}
-		else if (!getCache())
-		{
-			bean.reset();
-		}
-
-		// Reset the values
-		reset();
-
-		return EVAL_PAGE;
-	}
-
-	/**
-	 * doStartTag method.
-	 *
-	 * @return EVAL_BODY_TAG.
-	 * @exception JspException
-	 */
-	public int doStartTag()
-		throws JspException
-	{
-		// Get the Google bean
-		bean = TagUtility.getGoogleSearchBean(pageContext);
-
-		// Create a new bean if it doesn't exists
-		if (bean == null)
-		{
-			try
-			{
-				bean = new GoogleSearchBean();
-
-				// Set the bean as named session attribute
-				pageContext.setAttribute(TagUtility.GOOGLE_SEARCH_BEAN, bean,
-						PageContext.SESSION_SCOPE);
-			}
-			catch (Exception e)
-			{
-				throw new JspException("An unknown error ocurred while creating the Google search bean.");
-			}
-		}
-
-		return EVAL_BODY_TAG;
-	}
-
-	/**
-	 * Release method.
-	 */
-	public void release()
-	{
-		super.release();
-
-		// Reset all attributes
-		start = GoogleSearchBean.DEFAULT_START;
-		maxResults = GoogleSearchBean.DEFAULT_MAX_RESULTS;
-		filter = GoogleSearchBean.DEFAULT_FILTER;
-		safeSearch = GoogleSearchBean.DEFAULT_SAFE_SEARCH;
-		restrict = GoogleSearchBean.DEFAULT_RESTRICT;
-		lr = GoogleSearchBean.DEFAULT_LR;
-		site = GoogleSearchBean.DEFAULT_SITE;
-		cache = GoogleSearchBean.DEFAULT_CACHE;
-		type = GoogleSearchBean.DEFAULT_TYPE;
-
-		// Reset the bean
-		bean = null;
-
-		// Reset the values
-		reset();
-	}
-
-	/**
-	 * Reset the values.
-	 */
-	protected void reset()
-	{
-		super.reset();
-	}
 }
diff --git a/src/net/thauvin/google/taglibs/SearchComments.java b/google-taglib/src/net/thauvin/google/taglibs/SearchComments.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchComments.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchComments.java
diff --git a/src/net/thauvin/google/taglibs/SearchQuery.java b/google-taglib/src/net/thauvin/google/taglibs/SearchQuery.java
similarity index 80%
rename from src/net/thauvin/google/taglibs/SearchQuery.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchQuery.java
index 01c7137..de530a7 100644
--- a/src/net/thauvin/google/taglibs/SearchQuery.java
+++ b/google-taglib/src/net/thauvin/google/taglibs/SearchQuery.java
@@ -4,14 +4,14 @@
  *  Copyright (c) 2002-2003, Erik C. Thauvin (erik@thauvin.net)
  *  All rights reserved.
  *
- *  Redistribution and use in source and binary forms, with or without
+ *  Redistribution and use in source and binary forms, with or without 
  *  modification, are permitted provided that the following conditions are
  *  met:
  *
  *  Redistributions of source code must retain the above copyright notice,
  *  this list of conditions and the following disclaimer.
  *
- *  Redistributions in binary form must reproduce the above copyright notice,
+ *  Redistributions in binary form must reproduce the above copyright notice, 
  *  this list of conditions and the following disclaimer in the documentation
  *  and/or other materials provided with the distribution.
  *
@@ -20,7 +20,7 @@
  *  specific prior written permission.
  *
  *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
  *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
@@ -36,42 +36,17 @@
  */
 package net.thauvin.google.taglibs;
 
-import net.thauvin.google.TagUtility;
-
 
 /**
  * A custom tag used to retrieve the query string of a Google search.
  *
  * @author Erik C. Thauvin
  * @created April 29, 2002
- * @version $Revision$, $Date$
+ * @version $Revision$
  * @since 1.0
  */
 public class SearchQuery extends SearchResultSupport
 {
-	private String type = null;
-
-	/**
-	 * Sets the type attribute.
-	 *
-	 * @param type The new attribute value.
-	 * @since 1.0.1
-	 */
-	public final void setType(String type)
-	{
-		this.type = type;
-	}
-
-	/**
-	 * Release method.
-	 */
-	public void release()
-	{
-		super.release();
-
-		type = null;
-	}
-
 	/**
 	 * Returns the property provided by this tag.
 	 *
@@ -79,12 +54,7 @@ public class SearchQuery extends SearchResultSupport
 	 */
 	protected String getPropertyName()
 	{
-		if (TagUtility.isValidString(type) && type.equalsIgnoreCase("full"))
-		{
-			return "searchQuery";
-		}
-
-		return "searchKeywords";
+		return "searchQuery";
 	}
 
 	/**
diff --git a/src/net/thauvin/google/taglibs/SearchResult.java b/google-taglib/src/net/thauvin/google/taglibs/SearchResult.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchResult.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchResult.java
diff --git a/src/net/thauvin/google/taglibs/SearchResultSupport.java b/google-taglib/src/net/thauvin/google/taglibs/SearchResultSupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchResultSupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchResultSupport.java
diff --git a/src/net/thauvin/google/taglibs/SearchTime.java b/google-taglib/src/net/thauvin/google/taglibs/SearchTime.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchTime.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchTime.java
diff --git a/src/net/thauvin/google/taglibs/SearchTips.java b/google-taglib/src/net/thauvin/google/taglibs/SearchTips.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/SearchTips.java
rename to google-taglib/src/net/thauvin/google/taglibs/SearchTips.java
diff --git a/src/net/thauvin/google/taglibs/Spelling.java b/google-taglib/src/net/thauvin/google/taglibs/Spelling.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/Spelling.java
rename to google-taglib/src/net/thauvin/google/taglibs/Spelling.java
diff --git a/src/net/thauvin/google/taglibs/StartIndex.java b/google-taglib/src/net/thauvin/google/taglibs/StartIndex.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/StartIndex.java
rename to google-taglib/src/net/thauvin/google/taglibs/StartIndex.java
diff --git a/src/net/thauvin/google/taglibs/StyleSupport.java b/google-taglib/src/net/thauvin/google/taglibs/StyleSupport.java
similarity index 100%
rename from src/net/thauvin/google/taglibs/StyleSupport.java
rename to google-taglib/src/net/thauvin/google/taglibs/StyleSupport.java
diff --git a/src/net/thauvin/google/taglibs/package.html b/google-taglib/src/net/thauvin/google/taglibs/package.html
similarity index 100%
rename from src/net/thauvin/google/taglibs/package.html
rename to google-taglib/src/net/thauvin/google/taglibs/package.html
diff --git a/tlds/google.tld b/google-taglib/tlds/google.tld
similarity index 95%
rename from tlds/google.tld
rename to google-taglib/tlds/google.tld
index b2a7496..ae1569d 100644
--- a/tlds/google.tld
+++ b/google-taglib/tlds/google.tld
@@ -11,7 +11,9 @@
 	<!-- Public URI that uniquely identifies this version of the tag library -->
 	<uri>http://www.thauvin.net/taglibs/google-taglib-@version@</uri>
 	<!-- General information about this tag library -->
-	<info>The Google Tag Library.</info>
+	<info>
+		The Google Tag Library.
+	</info>
 	<!-- CachedPage Tag -->
 	<tag>
 		<name>cachedPage</name>
@@ -160,11 +162,6 @@
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
-		<attribute>
-			<name>type</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
 	</tag>
 	<!-- SearchComments Tag -->
 	<tag>
@@ -179,11 +176,6 @@
 		<tagclass>net.thauvin.google.taglibs.SearchQuery</tagclass>
 		<bodycontent>empty</bodycontent>
 		<info>Displays the current search query.</info>
-		<attribute>
-			<name>type</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
 	</tag>
 	<!-- SearchResult Tag -->
 	<tag>
diff --git a/google-tagunit/WEB-INF/web.xml b/google-tagunit/WEB-INF/web.xml
deleted file mode 100644
index 377552c..0000000
--- a/google-tagunit/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-	<display-name>google-tagunit</display-name>
-	<description>This webapp is a starting point for testing the Google Tag Library.</description>
-	<servlet>
-		<servlet-name>TagUnitTestController</servlet-name>
-		<servlet-class>org.tagunit.controller.FrontController</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>TagUnitTestController</servlet-name>
-		<url-pattern>/test/servlet/*</url-pattern>
-	</servlet-mapping>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-</web-app>
diff --git a/google-tagunit/index.html b/google-tagunit/index.html
deleted file mode 100644
index 32b2591..0000000
--- a/google-tagunit/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Set Google Key</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<!--
-	Copyright (c) 2002-2003, Erik C. Thauvin
-	All rights reserved.
--->
-<body bgcolor="#FFFFFF" text="#000000">
-<form action="index.jsp" method="post">
-	<input size="35" name="key" value="">&nbsp;<input type="submit" value="Set Google Key" name="btnG">
-</form>
-</body>
-</html>
diff --git a/google-tagunit/index.jsp b/google-tagunit/index.jsp
deleted file mode 100644
index 78cd9e7..0000000
--- a/google-tagunit/index.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%
-	// Copyright (c) 2002-2003, Erik C. Thauvin
-	// All rights reserved.
-
-	String key = request.getParameter("key");
-	
-	if ((key != null)&& (key.trim().length() > 0))
-	{
-		pageContext.setAttribute("google_key", key, PageContext.APPLICATION_SCOPE);
-%>
-	<jsp:forward page="test/servlet/RunTests?uri=/test/google/index.jsp"/>
-<%
-	}
-	else
-	{
-%>
-	<%@include file="index.html"%>
-<%
-	}
-%>
diff --git a/google-tagunit/test/error.jsp b/google-tagunit/test/error.jsp
deleted file mode 100644
index e010225..0000000
--- a/google-tagunit/test/error.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ page isErrorPage="true" %>
-
-<%@ taglib uri="http://www.tagunit.org/tagunit/display" prefix="tagunit" %>
-
-<html>
-
-  <head>
-    <title>TagUnit - Error</title>
-    <tagunit:base/>
-    <link rel="stylesheet" href="page.css">
-  </head>
-
-  <body>
-    <h2>Oops, there has been a problem...</h2>
-    <pre><%= org.tagunit.util.ExceptionUtils.getStackTraceAsString(exception) %></pre>
-
-  </body>
-
-</html>
\ No newline at end of file
diff --git a/google-tagunit/test/google/cachedPage/testSpecification.jsp b/google-tagunit/test/google/cachedPage/testSpecification.jsp
deleted file mode 100644
index 876b262..0000000
--- a/google-tagunit/test/google/cachedPage/testSpecification.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="JSP"/>
-
-<tagunit:assertAttribute name="key" required="false" rtexprvalue="true"/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/element/testSpecification.jsp b/google-tagunit/test/google/element/testSpecification.jsp
deleted file mode 100644
index 43dd2ad..0000000
--- a/google-tagunit/test/google/element/testSpecification.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertAttribute name="name" required="true" rtexprvalue="true"/>
-<tagunit:assertAttribute name="target" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="style" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="css" required="false" rtexprvalue="true"/>
diff --git a/google-tagunit/test/google/endIndex/testSpecification.jsp b/google-tagunit/test/google/endIndex/testSpecification.jsp
deleted file mode 100644
index 630a4e5..0000000
--- a/google-tagunit/test/google/endIndex/testSpecification.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/estimatedTotal/testSpecification.jsp b/google-tagunit/test/google/estimatedTotal/testSpecification.jsp
deleted file mode 100644
index 630a4e5..0000000
--- a/google-tagunit/test/google/estimatedTotal/testSpecification.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/index.jsp b/google-tagunit/test/google/index.jsp
deleted file mode 100644
index 76f3426..0000000
--- a/google-tagunit/test/google/index.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:testTagLibrary uri="/test/google">
-
-  <tagunit:tagLibraryDescriptor uri="/WEB-INF/google.tld"/>
-
-</tagunit:testTagLibrary>
\ No newline at end of file
diff --git a/google-tagunit/test/google/next/testSpecification.jsp b/google-tagunit/test/google/next/testSpecification.jsp
deleted file mode 100644
index f8fa598..0000000
--- a/google-tagunit/test/google/next/testSpecification.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="JSP"/>
-
-<tagunit:assertAttribute name="target" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="style" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="css" required="false" rtexprvalue="true"/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/previous/testSpecification.jsp b/google-tagunit/test/google/previous/testSpecification.jsp
deleted file mode 100644
index f8fa598..0000000
--- a/google-tagunit/test/google/previous/testSpecification.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="JSP"/>
-
-<tagunit:assertAttribute name="target" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="style" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="css" required="false" rtexprvalue="true"/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/search/testSpecification.jsp b/google-tagunit/test/google/search/testSpecification.jsp
deleted file mode 100644
index 22e1ce2..0000000
--- a/google-tagunit/test/google/search/testSpecification.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="JSP"/>
-
-<tagunit:assertAttribute name="key" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="start" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="maxResults" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="filter" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="restrict" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="safeSearch" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="lr" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="cache" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="site" required="false" rtexprvalue="true"/>
-<tagunit:assertAttribute name="type" required="false" rtexprvalue="true"/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/searchComments/testSpecification.jsp b/google-tagunit/test/google/searchComments/testSpecification.jsp
deleted file mode 100644
index 630a4e5..0000000
--- a/google-tagunit/test/google/searchComments/testSpecification.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/searchQuery/testSpecification.jsp b/google-tagunit/test/google/searchQuery/testSpecification.jsp
deleted file mode 100644
index ca7e9c2..0000000
--- a/google-tagunit/test/google/searchQuery/testSpecification.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="empty"/>
-
-<tagunit:assertAttribute name="type" required="false" rtexprvalue="true"/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/searchResult/testSpecification.jsp b/google-tagunit/test/google/searchResult/testSpecification.jsp
deleted file mode 100644
index 58460a5..0000000
--- a/google-tagunit/test/google/searchResult/testSpecification.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="JSP"/>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/searchTime/testSpecification.jsp b/google-tagunit/test/google/searchTime/testSpecification.jsp
deleted file mode 100644
index 630a4e5..0000000
--- a/google-tagunit/test/google/searchTime/testSpecification.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/searchTips/testSpecification.jsp b/google-tagunit/test/google/searchTips/testSpecification.jsp
deleted file mode 100644
index 630a4e5..0000000
--- a/google-tagunit/test/google/searchTips/testSpecification.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/spelling/testSpecification.jsp b/google-tagunit/test/google/spelling/testSpecification.jsp
deleted file mode 100644
index 876b262..0000000
--- a/google-tagunit/test/google/spelling/testSpecification.jsp
+++ /dev/null
@@ -1,5 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertBodyContent name="JSP"/>
-
-<tagunit:assertAttribute name="key" required="false" rtexprvalue="true"/>
\ No newline at end of file
diff --git a/google-tagunit/test/google/startIndex/testSpecification.jsp b/google-tagunit/test/google/startIndex/testSpecification.jsp
deleted file mode 100644
index 630a4e5..0000000
--- a/google-tagunit/test/google/startIndex/testSpecification.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<tagunit:assertNoAttributes/>
\ No newline at end of file
diff --git a/google-tagunit/test/images/spacer.gif b/google-tagunit/test/images/spacer.gif
deleted file mode 100644
index e44f8f0..0000000
Binary files a/google-tagunit/test/images/spacer.gif and /dev/null differ
diff --git a/google-tagunit/test/images/tagunit.gif b/google-tagunit/test/images/tagunit.gif
deleted file mode 100644
index 825917f..0000000
Binary files a/google-tagunit/test/images/tagunit.gif and /dev/null differ
diff --git a/google-tagunit/test/images/white-separator.gif b/google-tagunit/test/images/white-separator.gif
deleted file mode 100644
index 38b95b0..0000000
Binary files a/google-tagunit/test/images/white-separator.gif and /dev/null differ
diff --git a/google-tagunit/test/index.jsp b/google-tagunit/test/index.jsp
deleted file mode 100644
index b2b2245..0000000
--- a/google-tagunit/test/index.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
- <%@ taglib uri="http://www.tagunit.org/tagunit/core" prefix="tagunit" %>
-
-<%--
-  Tests for TagUnit tag libraries
-  -------------------------------
-  This page contains the tests required to automatically test the basics of
-  the tag libraries that are a part of the TagUnit framework
-  
---%>
-
-<tagunit:testTagLibrary uri="/test/tagunit">
-  <tagunit:tagLibraryDescriptor jar="tagunit.jar" name="tagunit-core.tld"/>
-</tagunit:testTagLibrary>
-
-<tagunit:testTagLibrary uri="/test/tagunit">
-  <tagunit:tagLibraryDescriptor jar="tagunit.jar" name="tagunit-display.tld"/>
-</tagunit:testTagLibrary>
\ No newline at end of file
diff --git a/google-tagunit/test/license.html b/google-tagunit/test/license.html
deleted file mode 100644
index 9729cd0..0000000
--- a/google-tagunit/test/license.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<html>
-
-  <head>
-    <title>TagUnit</title>
-    <link rel="stylesheet" href="page.css">
-  </head>
-
-  <body>
-
-    <p>
-    <h1>TagUnit license information</h1>
-    </p>
-    
-<pre>Copyright (c) 2002, Simon Brown
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  - Neither the name of TagUnit nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.</pre>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/google-tagunit/test/page.css b/google-tagunit/test/page.css
deleted file mode 100644
index e5d02f8..0000000
--- a/google-tagunit/test/page.css
+++ /dev/null
@@ -1,50 +0,0 @@
-body, p, table, thead, tbody {
-  font-family: verdana, arial, helvetica;
-  font-size: 8pt;
-  font-style: normal;
-  font-weight: normal;
-  text-align: left
-}
-
-h1 {
-  font-size: 18pt;
-  font-weight: bold;
-}
-
-h2 {
-  font-size: 14pt;
-  font-weight: bold;
-}
-
-a:link, a:visited, a:active {
-  color: #000000;
-}
-
-.pass {
-  color: 00CC00;
-}
-
-.warning {
-  color: FF9900;
-}
-
-.fail {
-  color: #CC0000;
-}
-
-.error {
-  color: #CC0000;
-}
-
-.message {
-  font-size: 8pt;
-}
-
-.banner {
-  font-size: 8pt;
-  border-top: solid black 2px;
-  border-right: solid black 2px;
-  border-bottom: solid black 2px;
-  border-left: solid black 2px;
-  color: white;
-}
\ No newline at end of file
diff --git a/google-tagunit/test/results.jsp b/google-tagunit/test/results.jsp
deleted file mode 100644
index b78b4cd..0000000
--- a/google-tagunit/test/results.jsp
+++ /dev/null
@@ -1,206 +0,0 @@
-<!--
-normal = 6699CC
-red = CC0000
-warning = CC6600
-pass = 00CC00
-
--->
-
-<%@ page import="org.tagunit.*" %>
-<%@ page errorPage="error.jsp" %>
-
-<%
-String color = "#6699CC";
-TestContextContainer testContext = (TestContextContainer)session.getAttribute(Constants.TEST_CONTEXT);
-if (testContext != null && testContext.getStatus().equals(TestContext.PASS)) {
-  color = "#00CC00";
-} else if (testContext != null && testContext.getStatus().equals(TestContext.WARNING)) {
-  color = "#CC6600";
-} else if (testContext != null && (testContext.getStatus().equals(TestContext.FAIL) || testContext.getStatus().equals(TestContext.ERROR))) {
-  color = "#CC0000";
-}
-%>
-
-<%@ taglib uri="http://www.tagunit.org/tagunit/display" prefix="tagunit" %>
-
-<html>
-
-  <head>
-    <title>TagUnit - Test Results</title>
-    <tagunit:base/>
-    <link rel="stylesheet" href="page.css">
-  </head>
-
-  <body>
-
-    <table width="100%" cellpadding="0" cellspacing="2" class="banner">
-      <tr>
-        <td width="200">
-          <a href="../index.jsp"><img src="images/tagunit.gif" alt="Banner image" border="0" /></a></td>
-        <td bgcolor="<%= color %>" valign="top" align="right">
-          Version <tagunit:getProperty name="version"/>&nbsp;
-        </td>
-      </tr>
-    </table>
-
-    <table width="100%" border="0">
-      <tr>
-        <td>
-          <h2>Test results</h2>
-        </td>
-        <td align="right">
-          <a href="servlet/ViewResults?showPasses=false&showWarnings=true">Hide passes</a>
-          |
-          <a href="servlet/ViewResults?showPasses=false&showWarnings=false">Hide warnings</a>
-          |
-          <a href="servlet/ViewResults?showPasses=true&showWarnings=true">Show all</a>
-          <br>
-          Ignore Warnings -
-          <a href="servlet/ViewResults?showPasses=true&showWarnings=true&ignoreWarnings=true">Yes</a>
-          |
-          <a href="servlet/ViewResults?showPasses=true&showWarnings=true&ignoreWarnings=false">No</a>
-        </td>
-      </tr>
-    </table>
-
-
-    <div align="center">
-      <br />
-      <br />
-      <table>
-        <tr>
-          <td>
-            <table>
-              <tr height="1">
-                <td width="64"></td>
-                <td width="400" bgcolor="#000000"></td>
-                <td width="32"></td>
-              </tr>
-            </table>
-            <table>
-              <tr>
-                <td width="64">
-                  <b>Passes</b>
-                </td>
-                <td width="<%= (testContext.getNumberOfPasses()*400)/testContext.getNumberOfTests() %>" bgcolor="#00CC00"></td>
-                <td width="32">
-                  <jsp:getProperty name="testContext" property="numberOfPasses"/>
-                </td>
-              </tr>
-            </table>
-            <%
-              if (!org.tagunit.TagUnitProperties.getInstance().getIgnoreWarnings()) {
-            %>
-            <table>
-              <tr>
-                <td width="64">
-                  <b>Warnings</b>
-                </td>
-                <td width="<%= (testContext.getNumberOfWarnings()*400)/testContext.getNumberOfTests() %>" bgcolor="#CC6600"></td>
-                <td width="32">
-                  <jsp:getProperty name="testContext" property="numberOfWarnings"/>
-                </td>
-              </tr>
-            </table>
-            <%
-              }
-            %>
-            <table>
-              <tr>
-                <td width="64">
-                  <b>Failures</b>
-                </td>
-                <td width="<%= (testContext.getNumberOfFailures()*400)/testContext.getNumberOfTests() %>" bgcolor="#CC0000"></td>
-                <td width="32">
-                  <jsp:getProperty name="testContext" property="numberOfFailures"/>
-                </td>
-              </tr>
-            </table>
-            <table>
-              <tr>
-                <td width="64">
-                  <b>Errors</b>
-                </td>
-                <td width="<%= (testContext.getNumberOfErrors()*400)/testContext.getNumberOfTests() %>" bgcolor="#CC0000"></td>
-                <td width="32">
-                  <jsp:getProperty name="testContext" property="numberOfErrors"/>
-                </td>
-              </tr>
-            </table>
-
-            <table>
-              <tr height="1">
-                <td width="64"></td>
-                <td width="400" bgcolor="#000000"></td>
-                <td width="32"></td>
-              </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-      <br />
-      <br />
-    </div>
-
-    <table width="100%" border="0">
-      <tagunit:testResults id="result">
-
-        <tagunit:showLevel level="1">
-          <tr><td colspan="2">&nbsp;</td></tr>
-        </tagunit:showLevel>
-
-        <tr>
-          <td>
-            <img src="images/spacer.gif" width="<%= level.intValue()*16 %>" height="1">
-            <tagunit:hasChildren><b></tagunit:hasChildren>
-            <%
-              if (result instanceof org.tagunit.TagTestContext) {
-                org.tagunit.TagTestContext ttc = (org.tagunit.TagTestContext)result;
-                out.print("<a name=\"" + ttc.getTagInfo().getName() + "\">");
-                out.print("<a href=\"servlet/ViewResults?&tag=" + ttc.getTagInfo().getName() + "#" + ttc.getTagInfo().getName() + "\">");
-              }
-            %>
-            <jsp:getProperty name="result" property="name"/>
-            <%
-              if (result instanceof org.tagunit.TagTestContext) {
-                out.print("</a>");
-              }
-            %>
-            <tagunit:hasChildren></b></tagunit:hasChildren>
-          </td>
-          <td>
-            <tagunit:hasChildren><b></tagunit:hasChildren>
-            <tagunit:pass><span class="pass">Pass</span></tagunit:pass>
-            <tagunit:warning><span class="warning">Warning</span></tagunit:warning>
-            <tagunit:failure><span class="fail">Fail</span></tagunit:failure>
-            <tagunit:error><span class="error">Error</span></tagunit:error>
-            <tagunit:hasChildren></b></tagunit:hasChildren>
-          </td>
-        </tr>
-
-        <tagunit:hasMessage>
-            <tagunit:warning>
-              <tr><td><span class="warning"><img src="images/spacer.gif" width="<%= level.intValue()*24 %>" height="1">Warning : <tagunit:filter><jsp:getProperty name="result" property="message"/></tagunit:filter></span></td><td>&nbsp;</td></tr>
-            </tagunit:warning>
-            <tagunit:failure>
-              <tr><td><span class="fail"><code><img src="images/spacer.gif" width="<%= level.intValue()*24 %>" height="1">Failure : <tagunit:filter><jsp:getProperty name="result" property="message"/></tagunit:filter></code></span></td><td>&nbsp;</td></tr>
-            </tagunit:failure>
-            <tagunit:error>
-              <tr><td><span class="error"><code><img src="images/spacer.gif" width="<%= level.intValue()*24 %>" height="1">Error : <tagunit:filter><jsp:getProperty name="result" property="message"/></tagunit:filter></code></span></td><td>&nbsp;</td></tr>
-            </tagunit:error>
-        </tagunit:hasMessage>
-
-      </tagunit:testResults>
-
-    </table>
-
-    <br />
-    <br />
-
-    <div align="center">
-        <a href="license.html">License</a>
-    </div>
-
-  </body>
-
-</html>
diff --git a/htdocs/images/jars25.gif b/htdocs/images/jars25.gif
deleted file mode 100644
index 04c1fe8..0000000
Binary files a/htdocs/images/jars25.gif and /dev/null differ
diff --git a/htdocs/images/uml.jpg b/htdocs/images/uml.jpg
deleted file mode 100644
index cb6b432..0000000
Binary files a/htdocs/images/uml.jpg and /dev/null differ
diff --git a/htdocs/uml.html b/htdocs/uml.html
deleted file mode 100644
index f783a91..0000000
--- a/htdocs/uml.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<link rel="stylesheet" href="includes/google.css">
-<title>Google Tag Library: UML</title>
-</head>
-<body topmargin="2">
-<img src="images/uml.jpg" border="0" alt="UML" usemap="#Map">
-<map name="Map">
-  <area shape="rect" coords="67,6,164,16" href="http://www.sparxsystems.com.au/" alt="Enterprise Architect">
-</map>
-</body>
-</html>
diff --git a/lib/tagunit.jar b/lib/tagunit.jar
deleted file mode 100644
index fe22da6..0000000
Binary files a/lib/tagunit.jar and /dev/null differ
diff --git a/lib/tlddoc.jar b/lib/tlddoc.jar
deleted file mode 100644
index b82f56d..0000000
Binary files a/lib/tlddoc.jar and /dev/null differ
diff --git a/licenses/LICENSE-tagunit.txt b/licenses/LICENSE-tagunit.txt
deleted file mode 100644
index 9324147..0000000
--- a/licenses/LICENSE-tagunit.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright (c) 2002/2003, Simon Brown
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  - Neither the name of TagUnit nor the names of its contributors may
-    be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/rss/.cvsignore b/rss/.cvsignore
deleted file mode 100644
index 3586368..0000000
--- a/rss/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build
-dist
-*.bat
\ No newline at end of file
diff --git a/rss/GoogleRSS.iml b/rss/GoogleRSS.iml
deleted file mode 100644
index 36999e8..0000000
--- a/rss/GoogleRSS.iml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4" relativePaths="false">
-  <component name="LvcsConfiguration">
-    <option name="LOCAL_VCS_ENABLED" value="false" />
-    <option name="LOCAL_VCS_PURGING_PERIOD" value="259200000" />
-  </component>
-  <component name="ModuleRootManager" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/build/google-rss" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.4.x" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="googleapi">
-        <CLASSES>
-          <root url="jar://C:/Documents and Settings/erik/My Documents/My Projects/sourceforge/google-taglib/lib/googleapi.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="google">
-        <CLASSES>
-          <root url="jar://C:/projects/sourceforge/google-taglib/dist/google.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="servlet">
-        <CLASSES>
-          <root url="jar://C:/projects/sourceforge/google-taglib/lib/servlet.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-  </component>
-</module>
-
diff --git a/rss/GoogleRSS.ipr b/rss/GoogleRSS.ipr
deleted file mode 100644
index f2bee3d..0000000
--- a/rss/GoogleRSS.ipr
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
-  <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <useEmacsModeOutput value="true" />
-      <maximumHeapSize value="128" />
-      <useCustomJdk value="false" />
-      <useJavaw value="false" />
-      <includeProjectClasspath value="false" />
-      <includeParser value="true" />
-    </buildFile>
-  </component>
-  <component name="CodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS" />
-    <option name="USE_PER_PROJECT_SETTINGS" value="false" />
-  </component>
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <option name="CLEAR_OUTPUT_DIRECTORY" value="false" />
-    <resourceExtensions>
-      <entry name=".+\.(properties|xml|html|dtd|tld)" />
-      <entry name=".+\.(gif|png|jpeg|jpg)" />
-    </resourceExtensions>
-  </component>
-  <component name="DataSourceManager" />
-  <component name="EntryPointsManager">
-    <entry_points />
-  </component>
-  <component name="ExportToHTMLSettings">
-    <option name="PRINT_LINE_NUMBERS" value="false" />
-    <option name="OPEN_IN_BROWSER" value="false" />
-    <option name="OUTPUT_DIRECTORY" />
-  </component>
-  <component name="GUI Designer component loader factory" />
-  <component name="ImportConfiguration">
-    <option name="VENDOR" />
-    <option name="RELEASE_TAG" />
-    <option name="LOG_MESSAGE" />
-    <option name="CHECKOUT_AFTER_IMPORT" value="true" />
-    <option name="KEYWORD_SUBSTITUTION_WRAPPERS" value="" />
-  </component>
-  <component name="J2EEManager" />
-  <component name="JavacSettings">
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="DEPRECATION" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-    <option name="MAXIMUM_HEAP_SIZE" value="128" />
-    <option name="USE_GENERICS_COMPILER" value="false" />
-  </component>
-  <component name="JavadocGenerationManager">
-    <option name="OUTPUT_DIRECTORY" />
-    <option name="OPTION_SCOPE" value="protected" />
-    <option name="OPTION_HIERARCHY" value="true" />
-    <option name="OPTION_NAVIGATOR" value="true" />
-    <option name="OPTION_INDEX" value="true" />
-    <option name="OPTION_SEPARATE_INDEX" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_USE" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_VERSION" value="true" />
-    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
-    <option name="OPTION_DEPRECATED_LIST" value="true" />
-    <option name="OTHER_OPTIONS" />
-    <option name="HEAP_SIZE" />
-    <option name="OPEN_IN_BROWSER" value="true" />
-  </component>
-  <component name="JikesSettings">
-    <option name="JIKES_PATH" value="" />
-    <option name="DEBUGGING_INFO" value="true" />
-    <option name="DEPRECATION" value="true" />
-    <option name="GENERATE_NO_WARNINGS" value="false" />
-    <option name="IS_EMACS_ERRORS_MODE" value="true" />
-    <option name="ADDITIONAL_OPTIONS_STRING" value="" />
-  </component>
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/GoogleRSS.iml" filepath="$PROJECT_DIR$/GoogleRSS.iml" />
-    </modules>
-  </component>
-  <component name="ProjectRootManager" version="2" assert-keyword="false" />
-  <component name="UI designer component loader factory" />
-  <component name="WebManager">
-    <option enabled="true" />
-  </component>
-  <component name="WebRootContainer">
-    <root url="file://$PROJECT_DIR$/google-rss-examples" name="google-rss-examples" validate="false" />
-  </component>
-  <component name="libraryTable" />
-  <component name="uidesigner-configuration">
-    <option name="INSTRUMENT_CLASSES" value="true" />
-  </component>
-</project>
-
diff --git a/rss/GoogleRSS.iws b/rss/GoogleRSS.iws
deleted file mode 100644
index a22af7d..0000000
--- a/rss/GoogleRSS.iws
+++ /dev/null
@@ -1,740 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4" relativePaths="false">
-  <component name="AppServerRunManager" />
-  <component name="AspectsView" />
-  <component name="BookmarkManager" />
-  <component name="CheckinPanelState" />
-  <component name="Commander">
-    <leftPanel />
-    <rightPanel />
-    <splitter proportion="0.5" />
-  </component>
-  <component name="CompilerWorkspaceConfiguration">
-    <option name="COMPILE_IN_BACKGROUND" value="false" />
-    <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
-  </component>
-  <component name="Cvs2Configuration">
-    <option name="ON_FILE_ADDING" value="0" />
-    <option name="ON_FILE_REMOVING" value="0" />
-    <option name="PRUNE_EMPTY_DIRECTORIES" value="true" />
-    <option name="SHOW_UPDATE_OPTIONS" value="true" />
-    <option name="SHOW_ADD_OPTIONS" value="true" />
-    <option name="SHOW_REMOVE_OPTIONS" value="true" />
-    <option name="MERGING_MODE" value="0" />
-    <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" />
-    <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" />
-    <option name="RESET_STICKY" value="false" />
-    <option name="CREATE_NEW_DIRECTORIES" value="true" />
-    <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="v" />
-    <option name="PROCESS_UNKNOWN_FILES" value="false" />
-    <option name="PROCESS_DELETED_FILES" value="false" />
-    <option name="SHOW_EDIT_DIALOG" value="false" />
-    <option name="RESERVED_EDIT" value="false" />
-    <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
-    <option name="SHOW_CHECKOUT_OPTIONS" value="true" />
-    <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="UPDATE_DATE_OR_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="SHOW_CHANGES_REVISION_SETTINGS">
-      <value>
-        <option name="BRANCH" value="" />
-        <option name="DATE" value="" />
-        <option name="USE_BRANCH" value="false" />
-        <option name="USE_DATE" value="false" />
-      </value>
-    </option>
-    <option name="SHOW_OUTPUT" value="false" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
-    <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
-    <option name="ADD_WATCH_INDEX" value="0" />
-    <option name="REMOVE_WATCH_INDEX" value="0" />
-    <option name="UPDATE_KEYWORD_SUBSTITUTION" />
-    <option name="MAKE_NEW_FILES_READONLY" value="false" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-  </component>
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="DebuggerManager">
-    <line_breakpoints />
-    <exception_breakpoints>
-      <breakpoint_any>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="SUSPEND_VM" value="true" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="LOG_MESSAGE" value="" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-      </breakpoint_any>
-    </exception_breakpoints>
-    <field_breakpoints />
-    <method_breakpoints />
-  </component>
-  <component name="DebuggerSettings">
-    <option name="TRACING_FILTERS_ENABLED" value="true" />
-    <option name="VALUE_LOOKUP_DELAY" value="700" />
-    <option name="DEBUGGER_TRANSPORT" value="0" />
-    <option name="FORCE_CLASSIC_VM" value="true" />
-    <option name="HIDE_DEBUGGER_ON_PROCESS_TERMINATION" value="false" />
-    <option name="SKIP_SYNTHETIC_METHODS" value="true" />
-    <option name="SKIP_CONSTRUCTORS" value="false" />
-    <option name="STEP_THREAD_SUSPEND_POLICY" value="SuspendThread" />
-    <option name="RUN_HOTSWAP_AFTER_COMPILE" value="RunHotswapAsk" />
-    <filter>
-      <option name="PATTERN" value="com.sun.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="java.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="javax.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="org.omg.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="sun.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <filter>
-      <option name="PATTERN" value="junit.*" />
-      <option name="ENABLED" value="true" />
-    </filter>
-    <data_representation>
-      <array_representation qualified_name="java.lang.Object[]" use_class_filters="true">
-        <option name="NAME" value="Arrays defaults" />
-        <option name="ENABLED" value="false" />
-        <label>
-          <option name="LABEL_EXPRESSION_ENABLED" value="false" />
-          <option name="SHOW_OBJECTID" value="true" />
-          <option name="LABEL_EXPRESSION" value="toString()" />
-        </label>
-        <children>
-          <option name="START_INDEX" value="0" />
-          <option name="END_INDEX" value="500" />
-          <option name="HIDE_NULL_ARRAY_ELEMENTS" value="false" />
-        </children>
-      </array_representation>
-      <class_representation qualified_name="java.lang.Object" use_class_filters="true">
-        <option name="NAME" value="Classes defaults" />
-        <option name="ENABLED" value="false" />
-        <label>
-          <option name="LABEL_EXPRESSION_ENABLED" value="false" />
-          <option name="SHOW_OBJECTID" value="true" />
-          <option name="LABEL_EXPRESSION" value="toString()" />
-        </label>
-        <children>
-          <option name="CHILDREN_EXPRESSION_ENABLED" value="false" />
-          <option name="SORT_ASCENDING" value="false" />
-          <option name="SHOW_SYNTHETICS" value="true" />
-          <option name="SHOW_STATIC" value="true" />
-          <option name="SHOW_STATIC_FINAL" value="true" />
-          <option name="CHILDREN_EXPRESSION" value="" />
-        </children>
-      </class_representation>
-      <primitive_representation>
-        <option name="NAME" value="Primitives defaults" />
-        <option name="ENABLED" value="false" />
-        <option name="SHOW_HEX" value="false" />
-      </primitive_representation>
-      <group>
-        <option name="NAME" value="Alternative collections view" />
-        <option name="ENABLED" value="false" />
-        <renderers>
-          <class_representation qualified_name="java.util.Map$Entry" use_class_filters="true">
-            <option name="NAME" value="view key and value" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="getKey() + &quot; -&gt; &quot; + getValue()" />
-            </label>
-            <children>
-              <option name="CHILDREN_EXPRESSION_ENABLED" value="true" />
-              <option name="SORT_ASCENDING" value="false" />
-              <option name="SHOW_SYNTHETICS" value="false" />
-              <option name="SHOW_STATIC" value="true" />
-              <option name="SHOW_STATIC_FINAL" value="false" />
-              <option name="CHILDREN_EXPRESSION" value="new Object() { Object key = getKey(); Object value = getValue(); }" />
-            </children>
-            <filters>
-              <option name="PATTERN" value="*" />
-              <option name="ENABLED" value="true" />
-            </filters>
-          </class_representation>
-          <class_representation qualified_name="java.util.Collection" use_class_filters="true">
-            <option name="NAME" value="view 'size()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="&quot;size = &quot; + size()" />
-            </label>
-            <filters>
-              <option name="PATTERN" value="*" />
-              <option name="ENABLED" value="true" />
-            </filters>
-          </class_representation>
-          <class_representation qualified_name="java.util.Set" use_class_filters="true">
-            <option name="NAME" value="view 'toArray()'" />
-            <option name="ENABLED" value="true" />
-            <children>
-              <option name="CHILDREN_EXPRESSION_ENABLED" value="true" />
-              <option name="SORT_ASCENDING" value="false" />
-              <option name="SHOW_SYNTHETICS" value="false" />
-              <option name="SHOW_STATIC" value="true" />
-              <option name="SHOW_STATIC_FINAL" value="false" />
-              <option name="CHILDREN_EXPRESSION" value="toArray()" />
-            </children>
-            <filters>
-              <option name="PATTERN" value="*" />
-              <option name="ENABLED" value="true" />
-            </filters>
-          </class_representation>
-          <class_representation qualified_name="java.util.List" use_class_filters="true">
-            <option name="NAME" value="view 'toArray()'" />
-            <option name="ENABLED" value="true" />
-            <children>
-              <option name="CHILDREN_EXPRESSION_ENABLED" value="true" />
-              <option name="SORT_ASCENDING" value="false" />
-              <option name="SHOW_SYNTHETICS" value="false" />
-              <option name="SHOW_STATIC" value="true" />
-              <option name="SHOW_STATIC_FINAL" value="false" />
-              <option name="CHILDREN_EXPRESSION" value="toArray()" />
-            </children>
-            <filters>
-              <option name="PATTERN" value="*" />
-              <option name="ENABLED" value="true" />
-            </filters>
-          </class_representation>
-          <class_representation qualified_name="java.util.Map" use_class_filters="true">
-            <option name="NAME" value="view 'entrySet()'" />
-            <option name="ENABLED" value="true" />
-            <children>
-              <option name="CHILDREN_EXPRESSION_ENABLED" value="true" />
-              <option name="SORT_ASCENDING" value="false" />
-              <option name="SHOW_SYNTHETICS" value="false" />
-              <option name="SHOW_STATIC" value="true" />
-              <option name="SHOW_STATIC_FINAL" value="false" />
-              <option name="CHILDREN_EXPRESSION" value="entrySet().toArray()" />
-            </children>
-            <filters>
-              <option name="PATTERN" value="*" />
-              <option name="ENABLED" value="true" />
-            </filters>
-          </class_representation>
-        </renderers>
-      </group>
-      <group>
-        <option name="NAME" value="Type wrappers" />
-        <option name="ENABLED" value="true" />
-        <renderers>
-          <class_representation qualified_name="java.lang.Integer" use_class_filters="true">
-            <option name="NAME" value="view 'intValue()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="intValue()" />
-            </label>
-          </class_representation>
-          <class_representation qualified_name="java.lang.Byte" use_class_filters="true">
-            <option name="NAME" value="view 'byteValue()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="byteValue()" />
-            </label>
-          </class_representation>
-          <class_representation qualified_name="java.lang.Double" use_class_filters="true">
-            <option name="NAME" value="view 'doubleValue()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="doubleValue()" />
-            </label>
-          </class_representation>
-          <class_representation qualified_name="java.lang.Float" use_class_filters="true">
-            <option name="NAME" value="view 'floatValue()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="floatValue()" />
-            </label>
-          </class_representation>
-          <class_representation qualified_name="java.lang.Long" use_class_filters="true">
-            <option name="NAME" value="view 'longValue()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="longValue()" />
-            </label>
-          </class_representation>
-          <class_representation qualified_name="java.lang.Short" use_class_filters="true">
-            <option name="NAME" value="view 'shortValue()'" />
-            <option name="ENABLED" value="true" />
-            <label>
-              <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-              <option name="SHOW_OBJECTID" value="true" />
-              <option name="LABEL_EXPRESSION" value="shortValue()" />
-            </label>
-          </class_representation>
-        </renderers>
-      </group>
-      <class_representation qualified_name="java.lang.Object" use_class_filters="true">
-        <option name="NAME" value="Show 'toString()'" />
-        <option name="ENABLED" value="false" />
-        <label>
-          <option name="LABEL_EXPRESSION_ENABLED" value="true" />
-          <option name="SHOW_OBJECTID" value="false" />
-          <option name="LABEL_EXPRESSION" value="toString()" />
-        </label>
-      </class_representation>
-    </data_representation>
-  </component>
-  <component name="ErrorTreeViewConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="HIDE_WARNINGS" value="false" />
-  </component>
-  <component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
-    <first-group selected-file="file://$PROJECT_DIR$/src/com/clevercactus/google/taglibs/SearchResults.java">
-      <entry file="file://$PROJECT_DIR$/LICENSE.txt" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="2" column="19" selection-start="51" selection-end="51" vertical-scroll-proportion="0.055829227">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/README.txt" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-            <folding />
-          </state>
-        </provider>
-      </entry>
-      <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/taglibs/SearchResults.java" pinned="false">
-        <provider selected="true" editor-type-id="text-editor">
-          <state line="40" column="26" selection-start="1829" selection-end="1829" vertical-scroll-proportion="0.028619528">
-            <folding>
-              <element signature="imports" expanded="true" />
-            </folding>
-          </state>
-        </provider>
-      </entry>
-    </first-group>
-    <second-group />
-  </component>
-  <component name="HierarchyBrowserManager">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SORT_ALPHABETICALLY" value="false" />
-    <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
-  </component>
-  <component name="InspectionManager">
-    <option name="AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="SPLITTER_PROPORTION" value="0.5" />
-    <profile name="Default" />
-  </component>
-  <component name="J2EEProjectPane" />
-  <component name="LvcsProjectConfiguration">
-    <option name="ADD_LABEL_ON_PROJECT_OPEN" value="true" />
-    <option name="ADD_LABEL_ON_PROJECT_COMPILATION" value="true" />
-    <option name="ADD_LABEL_ON_FILE_PACKAGE_COMPILATION" value="true" />
-    <option name="ADD_LABEL_ON_PROJECT_MAKE" value="true" />
-    <option name="ADD_LABEL_ON_RUNNING" value="true" />
-    <option name="ADD_LABEL_ON_DEBUGGING" value="true" />
-    <option name="ADD_LABEL_ON_UNIT_TEST_PASSED" value="true" />
-    <option name="ADD_LABEL_ON_UNIT_TEST_FAILED" value="true" />
-  </component>
-  <component name="PackagesPane" />
-  <component name="ProjectPane">
-    <expanded_node url="file://$PROJECT_DIR$" module="GoogleRSS" type="directory" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" splitterProportion="0.5">
-      <flattenPackages />
-      <showMembers />
-      <showLibraryContents />
-      <flattenPackages />
-      <hideEmptyPackages />
-      <showStructure ProjectPane="false" />
-      <autoscrollToSource />
-    </navigator>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="MemberChooser.copyJavadoc" value="false" />
-    <property name="GoToClass.includeLibraries" value="false" />
-    <property name="MemberChooser.showClasses" value="true" />
-    <property name="MemberChooser.sorted" value="false" />
-    <property name="GoToFile.includeJavaFiles" value="false" />
-    <property name="GoToClass.toSaveIncludeLibraries" value="false" />
-  </component>
-  <component name="RunManager">
-    <option name="SHOW_SETTINGS_BEFORE_RUNNING" value="true" />
-    <option name="COMPILE_BEFORE_RUNNING" value="true" />
-    <activeType name="WebApp" />
-    <configuration name="&lt;template&gt;" type="Application" default="true" selected="false">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <module name="GoogleRSS" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="JUnit" default="true" selected="false">
-      <module name="GoogleRSS" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ADDITIONAL_CLASS_PATH" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="Remote" default="true" selected="false">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <module name="" />
-      <WebServerIntegration name="" />
-      <Host>localhost</Host>
-      <Port>5050</Port>
-      <LaunchServer>false</LaunchServer>
-    </configuration>
-    <configuration name="&lt;template&gt;" type="WebLogic Instance" default="true" selected="false">
-      <option name="WEBLOGIC_INSTANCE_CONFIGURATION_NAME" />
-    </configuration>
-    <configuration name="RSSGenerator" type="Application" default="false" selected="true">
-      <option name="MAIN_CLASS_NAME" value="com.clevercactus.google.RSSGenerator" />
-      <option name="VM_PARAMETERS" value="" />
-      <option name="PROGRAM_PARAMETERS" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <module name="GoogleRSS" />
-    </configuration>
-    <configuration name="Examples" type="WebApp" default="false" selected="true">
-      <module name="GoogleRSS" />
-      <WebServerIntegration name="Tomcat 4.0.x Server">
-        <option name="MAIN_CLASS" value="org.apache.catalina.startup.Bootstrap" />
-        <option name="TOMCAT_HOME" value="C:/Program Files/Apache Group/Tomcat 4.1" />
-        <option name="CONFIG_DIRECTORY" value="C:/Program Files/Apache Group/Tomcat 4.1/conf" />
-        <option name="CONTEXT_PATH" value="/google-examples" />
-        <option name="VM_ARGUMENTS" value="" />
-        <option name="INCLUDE_MODULE_CLASSPATH" value="false" />
-      </WebServerIntegration>
-      <Host>localhost</Host>
-      <Port>5050</Port>
-      <LaunchServer>false</LaunchServer>
-    </configuration>
-  </component>
-  <component name="SelectInManager" />
-  <component name="StarteamConfiguration">
-    <option name="SERVER" value="" />
-    <option name="PORT" value="49201" />
-    <option name="USER" value="" />
-    <option name="PASSWORD" value="" />
-    <option name="PROJECT" value="" />
-    <option name="VIEW" value="" />
-    <option name="ALTERNATIVE_WORKING_PATH" value="" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-  </component>
-  <component name="StructureViewFactory">
-    <option name="SORT_MODE" value="0" />
-    <option name="GROUP_INHERITED" value="true" />
-    <option name="AUTOSCROLL_MODE" value="true" />
-    <option name="SHOW_FIELDS" value="true" />
-    <option name="AUTOSCROLL_FROM_SOURCE" value="false" />
-    <option name="GROUP_GETTERS_AND_SETTERS" value="true" />
-    <option name="SHOW_INHERITED" value="false" />
-    <option name="HIDE_NOT_PUBLIC" value="false" />
-  </component>
-  <component name="TodoView" selected-index="0">
-    <todo-panel id="selected-file">
-      <are-packages-shown value="false" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-    <todo-panel id="all">
-      <are-packages-shown value="true" />
-      <flatten-packages value="false" />
-      <is-autoscroll-to-source value="true" />
-    </todo-panel>
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="-4" y="-4" width="1032" height="776" extended-state="0" />
-    <editor active="true" />
-    <layout>
-      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.30816326" order="0" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33026114" order="1" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.2489796" order="1" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="8" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.18673469" order="1" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33026114" order="2" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
-      <window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
-      <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" />
-      <window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
-      <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" />
-    </layout>
-  </component>
-  <component name="VCS.FileViewConfiguration">
-    <option name="SELECTED_STATUSES" value="DEFAULT" />
-    <option name="SELECTED_COLUMNS" value="DEFAULT" />
-    <option name="SHOW_FILTERS" value="true" />
-    <option name="CUSTOMIZE_VIEW" value="true" />
-    <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" />
-  </component>
-  <component name="VcsManagerConfiguration">
-    <option name="ACTIVE_VCS_NAME" value="CVS" />
-  </component>
-  <component name="VssConfiguration">
-    <CheckoutOptions>
-      <option name="COMMENT" value="" />
-      <option name="DO_NOT_GET_LATEST_VERSION" value="false" />
-      <option name="REPLACE_WRITABLE" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </CheckoutOptions>
-    <CheckinOptions>
-      <option name="COMMENT" value="" />
-      <option name="KEEP_CHECKED_OUT" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </CheckinOptions>
-    <AddOptions>
-      <option name="COMMENT" value="" />
-      <option name="STORE_ONLY_LATEST_VERSION" value="false" />
-      <option name="CHECK_OUT_IMMEDIATELY" value="false" />
-      <option name="FILE_TYPE" value="0" />
-    </AddOptions>
-    <UndocheckoutOptions>
-      <option name="MAKE_WRITABLE" value="false" />
-      <option name="REPLACE_LOCAL_COPY" value="0" />
-      <option name="RECURSIVE" value="false" />
-    </UndocheckoutOptions>
-    <GetOptions>
-      <option name="REPLACE_WRITABLE" value="0" />
-      <option name="MAKE_WRITABLE" value="false" />
-      <option name="RECURSIVE" value="false" />
-    </GetOptions>
-    <option name="CLIENT_PATH" value="" />
-    <option name="SRCSAFEINI_PATH" value="" />
-    <option name="USER_NAME" value="" />
-    <option name="PWD" value="" />
-    <option name="SHOW_CHECKOUT_OPTIONS" value="true" />
-    <option name="SHOW_ADD_OPTIONS" value="true" />
-    <option name="VSS_IS_INITIALIZED" value="false" />
-    <option name="SHOW_UNDOCHECKOUT_OPTIONS" value="true" />
-    <option name="SHOW_DIFF_OPTIONS" value="true" />
-    <option name="SHOW_GET_OPTIONS" value="true" />
-    <option name="REUSE_LAST_COMMENT" value="false" />
-    <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
-    <option name="SHOW_CHECKIN_OPTIONS" value="true" />
-    <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
-    <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
-    <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
-    <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
-    <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
-  </component>
-  <component name="WebViewSettings">
-    <webview flattenPackages="false" showMembers="false" autoscrollToSource="false" />
-  </component>
-  <component name="antWorkspaceConfiguration">
-    <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
-    <option name="FILTER_TARGETS" value="false" />
-    <buildFile url="file://$PROJECT_DIR$/build.xml">
-      <runInBackground value="false" />
-      <viewClosedWhenNoErrors value="false" />
-      <treeView value="true" />
-      <verbose value="true" />
-    </buildFile>
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/tlds/google-rss.tld">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="23" selection-start="779" selection-end="779" vertical-scroll-proportion="0.7619048">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.properties">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="16" column="29" selection-start="257" selection-end="257" vertical-scroll-proportion="0.7619048">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/google-rss-examples/WEB-INF/web.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/google-rss-examples/rss.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="193" selection-start="193" selection-end="193" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="90" column="62" selection-start="3459" selection-end="3459" vertical-scroll-proportion="2.562814">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/RSSGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="6" selection-start="1975" selection-end="1975" vertical-scroll-proportion="1.464991">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/AtomGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="48" column="6" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.8330341">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/FeedGenerationException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="6" selection-start="1842" selection-end="1842" vertical-scroll-proportion="0.33213645">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/FeedGenerator.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="56" column="6" selection-start="2305" selection-end="2305" vertical-scroll-proportion="1.1310593">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/FeedGeneratorFactory.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="41" column="6" selection-start="1704" selection-end="1704" vertical-scroll-proportion="0.33213645">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/GoogleResultsWrapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="1616" selection-end="1616" vertical-scroll-proportion="0.9389587">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/GoogleResultsWrapperItem.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="33" column="0" selection-start="1616" selection-end="1616" vertical-scroll-proportion="0.49371633">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/LICENSE.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="2" column="19" selection-start="51" selection-end="51" vertical-scroll-proportion="0.055829227">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/clevercactus/google/taglibs/SearchResults.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="40" column="26" selection-start="1829" selection-end="1829" vertical-scroll-proportion="0.028619528">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
-
diff --git a/rss/LICENSE.txt b/rss/LICENSE.txt
deleted file mode 100644
index 001be53..0000000
--- a/rss/LICENSE.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Google RSS Tag Library License
-
-Copyright (c) 2003-2004, clevercactus ltd.
-Copyright (c) 2003-2004, Erik C. Thauvin (erik@thauvin.net)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list 
-of conditions and the following disclaimer. 
-
-Redistributions in binary form must reproduce the above copyright notice, this 
-list of conditions and the following disclaimer in the documentation and/or 
-other materials provided with the distribution. 
-
-Neither the name of the author nor the names of its contributors may be used to 
-endorse or promote products derived from this software without specific prior 
-written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/rss/README-BUILD.txt b/rss/README-BUILD.txt
deleted file mode 100644
index e8cafe9..0000000
--- a/rss/README-BUILD.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-Google RSS Tag Library README (BUILD)
-=====================================
-
-
-Overview
-========
-
-This README file describes the Google RSS Tag Library source distribution.
-
-The Google RSS Tag Library is an extension to, and thus requires, the
-Google Tag Library, which can be found at:
-
-	<http://google-taglib.sourceforge.net/>
-
-
-See the "LICENSE.txt" file for licensing details.
-
-The Google RSS Tag Library uses the Google Web APIs, but is not associated
-with or sponsored by Google, Inc.
-
-Google Web APIs
-===============
-
-The Google Web APIs Java library is required in order to build the Google
-RSS Tag Library. The library's JAR file (googleapi.jar) should be placed
-into the lib directory.
-
-	http://www.google.com/apis/download.html
-	
-
-Building the Source
-===================
-
-The Google RSS Tag Library is intended to be build directly within the
-Google Tag Library source tree:
-
-	/google-taglib/rss/
-
-
-The Google RSS Tag Library is built using Ant. 
-
-	http://ant.apache.org/
-	
-
-To build the JAR, to do the following:
-
-	ant
-	
-To build the TLD, do the following:
-
-	ant tld
-	
-To build the release archive, do the following:
-
-	ant release
-	
-To build the Examples WAR, do the following:
-
-	ant examples
-	
-To list all available build targets, do the following:
-
-	ant -projecthelp
-
-
-===========================================================================
-$Id$
\ No newline at end of file
diff --git a/rss/README.txt b/rss/README.txt
deleted file mode 100644
index b90b5ad..0000000
--- a/rss/README.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Google RSS Tag Library README
-=============================
-
-
-Overview
-========
-
-This README file describes the Google RSS Tag Library distribution.
-
-The Google RSS Tag Library is an extension to, and thus requires, the
-Google Tag Library, which can be found at:
-
-	<http://google-taglib.sourceforge.net/>
-
-
-See the "LICENSE.txt" file for licensing details.
-
-The Google RSS Tag Library uses the Google Web APIs, but is not associated
-with or sponsored by Google, Inc.
-
-
-Installation
-============
-
-The Google RSS Tag Library requires a JSP (1.1 or higher) container, such
-as Tomcat.
-
-To use the Google RSS Tag Library, simply copy the library's JAR file
-(google-rss.jar) to your application's WEB-INF/lib directory. The Tag Library
-Descriptor (google-rss.tld) should be placed in your application's WEB-INF
-directory.
-
-You should also modify your web application deployment descriptor (web.xml)
-file to map the Google RSS Tag Library TLD URI to its location:
-
-	<taglib> 
-		<taglib-uri>/google-rss-taglib</taglib-uri>
-		<taglib-location>/WEB-INF/google-rss.tld</taglib-location>
-	</taglib>
-
-
-TagLib Directive
-================
-
-Using the Google RSS Tag Library is easy; you simply need to import it into
-your JSP pages using the taglib directive. For instance, you would include
-the following line at the top of your JSP page:
-
-	<%@taglib uri="/google-rss-taglib" prefix="rss"%>
-	
-	
-SearchResults Tag
-=================
-
-The <rss:searchResults/> tag is used to display the search results returned
-by a Google search (performed using the Google Tag Library) in RSS format.
-
-For example:
-
-	<%@ page contentType="text/xml" %>
-	<%@ taglib uri="/google-taglib" prefix="google" %>
-	<%@ taglib uri="/google-rss-taglib" prefix="rss" %>
-	<google:search>my search query</google:search>
-	<rss:searchResults>
-	
-Please refer to the Google Tag Library documentation for detailed information
-on performing searches.
-
-
-===========================================================================
-$Id$
\ No newline at end of file
diff --git a/rss/build.properties b/rss/build.properties
deleted file mode 100644
index 0171c3d..0000000
--- a/rss/build.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# Version
-version=1.0
-
-# Project
-project.name=google-rss
-release.name=${project.name}-taglib-${version}
-
-# Google Tag Library
-google.dir=..
-google.target=jar
-google.jar=../dist/google.jar
-google.tld=../dist/google.tld
-
-# Locations
-src.dir=src
-build.dir=build
-dist.dir=dist
-lib.dir=${google.dir}/lib
-tlds.dir=tlds
-
-# Examples
-ex.dir=${project.name}-examples
-
-# Source
-src.excludes=${lib.dir}/googleapi.jar
-
-# Docs
-doc.license=LICENSE.txt
-doc.readme=README.txt
-doc.src=README-BUILD.txt
\ No newline at end of file
diff --git a/rss/google-rss-examples/README.txt b/rss/google-rss-examples/README.txt
deleted file mode 100644
index 9bdbd8b..0000000
--- a/rss/google-rss-examples/README.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-Google RSS Tag Library Examples README
-======================================
-
-
-Overview
-========
-
-This README file describes the Google RSS Tag Library Examples web
-application.
-	
-This web application contains a collection of examples demonstrating the
-usage of the Google JSP RSS Tag Library. For more information about using
-the custom tag library in your own web applications, please refer to the
-Google RSS Tag Library documentation.
-
-The Google RSS Tag Library is an extension to the Google Tag Library, which
-can be found at:
-
-	<http://google-taglib.sourceforge.net/>
-	
-See the "LICENSE.txt" file for licensing details.
-
-The Google RSS Tag Library uses the Google Web APIs, but is not associated
-with or sponsored by Google, Inc.
-
-
-Google Web APIs
-===============
-
-The Google Web APIs Java library is required in order to use the Examples web
-application. The library's JAR file (googleapi.jar) should be placed into the
-application's WEB-INF/lib directory.
-
-	http://www.google.com/apis/download.html
-
-You must also register with Google (free) in order to obtain a license key.
-The license key is required to access Google's Web Services.
-
-	https://www.google.com/accounts/NewAccount
-	
-
-Google License Key
-==================
-
-The license key can be specified as a context parameter in the web
-application deployment descriptor (web.xml) as follows:
-
-	<context-param>
-		<param-name>google_key</param-name>
-		<param-value>000000000000000000000000</param-value>
-	</context-param>
-
-The license key can also be temporarily specified from the index page of
-the web application.
-
-
-Examples
-========
-
-The following example is included: 
-
-	- Perform a simple Google RSS search
-
-
-===========================================================================
-$Id$
\ No newline at end of file
diff --git a/rss/google-rss-examples/WEB-INF/web.xml b/rss/google-rss-examples/WEB-INF/web.xml
deleted file mode 100644
index 2d63d72..0000000
--- a/rss/google-rss-examples/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<web-app>
-	<display-name>google-rss-examples</display-name>
-	<description>Google RSS Examples Web Application</description>
-	<context-param>
-		<param-name>google_key</param-name>
-		<param-value/>
-		<description>The Google Web APIs client authorization key.</description>
-	</context-param>
-	<context-param>
-		<param-name>google_proxy_host</param-name>
-		<param-value/>
-		<description>The host to use as an HTTP proxy.</description>
-	</context-param>
-	<context-param>
-		<param-name>google_proxy_port</param-name>
-		<param-value/>
-		<description>The port to use as an HTTP proxy.</description>
-	</context-param>
-	<context-param>
-		<param-name>google_proxy_username</param-name>
-		<param-value/>
-		<description>The username required for the HTTP proxy.</description>
-	</context-param>
-	<context-param>
-		<param-name>google_proxy_password</param-name>
-		<param-value/>
-		<description>The password required for the HTTP proxy.</description>
-	</context-param>
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-	<taglib>
-		<taglib-uri>/google-taglib</taglib-uri>
-		<taglib-location>/WEB-INF/google.tld</taglib-location>
-	</taglib>
-	<taglib>
-		<taglib-uri>/google-rss-taglib</taglib-uri>
-		<taglib-location>/WEB-INF/google-rss.tld</taglib-location>
-	</taglib>
-</web-app>
diff --git a/rss/google-rss-examples/index.html b/rss/google-rss-examples/index.html
deleted file mode 100644
index 9639482..0000000
--- a/rss/google-rss-examples/index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Google RSS Tag Library Examples</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-<!--
-	body {font-family:arial,sans-serif}
--->
-</style>
-</head>
-<!--
-	Copyright (c) 2003-2004, Erik C. Thauvin
-	All rights reserved.
--->
-<body bgcolor="#FFFFFF" text="#000000"> 
-<b><font size="+2">Google RSS Tag Library Examples</font></b> 
-<p>
-This is a collection of examples demonstrating the usage of the <a href="http://google-taglib.sourceforge.net">Google RSS JSP Tag Library</a>.
-</p>
-<p>
-The Google RSS Tag Library is an extension to the <a href="http://google-taglib.sourceforge.net">Google Tag Library</a>.
-</p>
-<p>
-The Google Web APIs Java library is required in order to use the Google RSS Tag 
-Library. The library's JAR file (<code>googleapi.jar</code>) should be placed 
-into the application's <code>WEB-INF/lib</code> directory.
-</p>
-<ul>
-	<li>
-		<a href="http://www.google.com/apis/download.html"><b>Download the Google Web 
-		APIs developer's kit</b></a>
-	</li>
-</ul>
-<p>
-You must also register with Google (free) in order to  obtain a license key. The 
-license key is required to access Google's Web Services.
-</p>
-<ul>
-	<li>
-		<a href="https://www.google.com/accounts/NewAccount"><b>Sign up for a Google 
-		account</b></a>
-</ul>
-<p>
-The license key can be specified as a context parameter in the web application 
-deployment descriptor (<code>web.xml</code>) as follows:
-</p>
-<blockquote>
-	<pre>&lt;context-param&gt;<br>  &lt;param-name&gt;google_key&lt;/param-name&gt;<br>  &lt;param-value&gt;000000000000000000000000&lt;/param-value&gt;<br>&lt;/context-param&gt;</pre>
-</blockquote>
-<p>
-The license key can also be temporarily specified using the following:
-</p>
-<ul>
-	<li>
-		<a href="key.html"><b>Set the Google Web APIs license key</b></a>
-	</li>
-</ul>
-<p>
-The included examples will allow you to:
-</p> 
-<ul> 
-  <li> <a href="search.html"><b>Perform a simple Google RSS search</b></a></li> 
-</ul>
-<p>&nbsp;</p> 
-<p>
-<small>The Google RSS Tag Library uses the Google Web APIs, but is not associated with or sponsored by Google, Inc.<br> 
-Click <a href="LICENSE.txt">here</a> for licensing information.</small>
-</p> 
-</body>
-</html>
diff --git a/rss/google-rss-examples/key.html b/rss/google-rss-examples/key.html
deleted file mode 100644
index 4fa97a3..0000000
--- a/rss/google-rss-examples/key.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Set Google Key</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<!--
-	Copyright (c) 2002-2004, Erik C. Thauvin
-	All rights reserved.
--->
-<body bgcolor="#FFFFFF" text="#000000">
-<form action="key.jsp" method="post">
-	<input size="35" name="key" value="">&nbsp;<input type="submit" value="Set Google Key" name="btnG">
-</form>
-</body>
-</html>
diff --git a/rss/google-rss-examples/key.jsp b/rss/google-rss-examples/key.jsp
deleted file mode 100644
index cf30658..0000000
--- a/rss/google-rss-examples/key.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%
-	// Copyright (c) 2002-2004, Erik C. Thauvin
-	// All rights reserved.
-
-	String key = request.getParameter("key");
-	
-	if ((key != null)&& (key.trim().length() > 0))
-	{
-		pageContext.setAttribute("google_key", key, PageContext.APPLICATION_SCOPE);
-%>
-	<%@include file="search.html"%>
-<%
-	}
-	else
-	{
-%>
-	<%@include file="key.html"%>
-<%
-	}
-%>
-
diff --git a/rss/google-rss-examples/rss.jsp b/rss/google-rss-examples/rss.jsp
deleted file mode 100644
index 0c7d8b5..0000000
--- a/rss/google-rss-examples/rss.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<%@ page contentType="text/xml" %><%@ taglib uri="/google-taglib" prefix="google" %><%@ taglib uri="/google-rss-taglib" prefix="rss" %><google:search/><rss:searchResults/>
diff --git a/rss/google-rss-examples/search.html b/rss/google-rss-examples/search.html
deleted file mode 100644
index 9367268..0000000
--- a/rss/google-rss-examples/search.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>Search Google</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-<!--
-	Copyright (c) 2002-2004, Erik C. Thauvin
-	All rights reserved.
--->
-<body bgcolor="#FFFFFF" text="#000000">
-<form action="rss.jsp" method="get">
-	<input type="hidden" name="maxResults" value="5"><input maxLength="255" size="35" name="q" value="">&nbsp;<input type="submit" value="Google RSS Search" name="btnG">
-</form>
-</body>
-</html>
diff --git a/rss/src/com/clevercactus/google/AtomGenerator.java b/rss/src/com/clevercactus/google/AtomGenerator.java
deleted file mode 100644
index 292111c..0000000
--- a/rss/src/com/clevercactus/google/AtomGenerator.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-import org.xml.sax.SAXException;
-
-import java.io.PrintWriter;
-import java.util.Date;
-
-/**
- * A class that uses JAXP and SAX to print an SearchResults 2.0 feed to a PrintWriter.
- * Output of the SearchResults happens as data is added. See the main() method for a
- * simple usage example.
- *
- * @version 1.0, 29/08/2003
- * @author Diego Doval
- */
-public
-class AtomGenerator
-	extends FeedGenerator
-{
-	/**
-	 * The one and only constructor.
-	 */
-	public
-	AtomGenerator()
-	{
-	}
-
-	/**
-	 * Prints a valid SearchResults 2.0 header based on the information passed.
-	 *
-	 * @param title feed title
-	 * @param link feed link
-	 * @param description feed description
-	 * @param author feed author (must be an email address)
-	 * @param lastBuildDate the date the feed was built
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	printHeader(String title, String link, String description, String author, Date lastBuildDate)
-		throws FeedGenerationException
-	{
-		try {
-			String language = "en-us";
-			String generatorName = "clevercactus atom generator 1.0";
-			String generatorURL = "http://www.clevercactus.com/google/";
-			String copyright = "Copyright (c) 2003-2004 clevercactus ltd.";
-			String authorName = "Diego Doval";
-
-			feedAttributes_d.clear();
-			feedAttributes_d.addAttribute("", "", "version", "", "0.2");
-			feedAttributes_d.addAttribute("", "", "xmlns", "", "http://purl.org/atom/ns#");
-			feedAttributes_d.addAttribute("", "", "xml:lang", "", "en");
-			transformerHandler_d.startElement("","","feed",feedAttributes_d);
-
-			feedAttributes_d.clear();
-			transformerHandler_d.startElement("","","author",feedAttributes_d);
-			transformerHandler_d.startElement("","","name",feedAttributes_d);
-			transformerHandler_d.characters(authorName.toCharArray(),0,authorName.length());
-			transformerHandler_d.endElement("","","name");
-			transformerHandler_d.endElement("","","author");
-
-			feedAttributes_d.clear();
-			transformerHandler_d.startElement("","","title",feedAttributes_d);
-			transformerHandler_d.characters(title.toCharArray(),0,title.length());
-			transformerHandler_d.endElement("","","title");
-			transformerHandler_d.startElement("","","link",feedAttributes_d);
-			transformerHandler_d.characters(link.toCharArray(),0,link.length());
-			transformerHandler_d.endElement("","","link");
-			transformerHandler_d.startElement("","","tagline", feedAttributes_d);
-			transformerHandler_d.characters(description.toCharArray(),0,description.length());
-			transformerHandler_d.endElement("","","tagline");
-			transformerHandler_d.startElement("","","modified",elementAttributes_d);
-			String dtString = getAsISO8601String(lastBuildDate);
-			transformerHandler_d.characters(dtString.toCharArray(),0,dtString.length());
-			transformerHandler_d.endElement("","","modified");
-			feedAttributes_d.addAttribute("", "", "name", "", generatorName);
-			transformerHandler_d.startElement("","","generator", feedAttributes_d);
-			transformerHandler_d.characters(generatorURL.toCharArray(),0, generatorURL.length());
-			transformerHandler_d.endElement("","","generator");
-			feedAttributes_d.clear();
-			transformerHandler_d.startElement("","","copyright", feedAttributes_d);
-			transformerHandler_d.characters(copyright.toCharArray(),0,copyright.length());
-			transformerHandler_d.endElement("","","copyright");
-		}
-		catch (SAXException e) {
-			throw new FeedGenerationException(e);
-		}
-	}
-
-	/**
-	 * Prints a valid SearchResults 2.0 item based on the information passed.
-	 *
-	 * @param title the entry title
-	 * @param description the entry body/description
-	 * @param link the entry's GUID
-	 * @param date the entry publication date
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	printItem(String title, String description, String link, Date date)
-		throws FeedGenerationException
-	{
-		try {
-			elementAttributes_d.clear();
-
-			transformerHandler_d.startElement("","","entry",elementAttributes_d);
-			transformerHandler_d.startElement("","","title",elementAttributes_d);
-			transformerHandler_d.characters(title.toCharArray(),0,title.length());
-			transformerHandler_d.endElement("","","title");
-
-			transformerHandler_d.startElement("","","issued",elementAttributes_d);
-			String dtString = getAsISO8601String(date);
-			transformerHandler_d.characters(dtString.toCharArray(),0,dtString.length());
-			transformerHandler_d.endElement("","","issued");
-
-			transformerHandler_d.startElement("","","modified",elementAttributes_d);
-			transformerHandler_d.characters(dtString.toCharArray(),0,dtString.length());
-			transformerHandler_d.endElement("","","modified");
-
-			transformerHandler_d.startElement("","","created",elementAttributes_d);
-			transformerHandler_d.characters(dtString.toCharArray(),0,dtString.length());
-			transformerHandler_d.endElement("","","created");
-
-			transformerHandler_d.startElement("","","link",elementAttributes_d);
-			transformerHandler_d.characters(link.toCharArray(),0,link.length());
-			transformerHandler_d.endElement("","","link");
-
-			transformerHandler_d.startElement("","","id",elementAttributes_d);
-			transformerHandler_d.characters(link.toCharArray(),0,link.length());
-			transformerHandler_d.endElement("","","id");
-
-			elementAttributes_d.clear();
-			elementAttributes_d.addAttribute("", "", "type", "", "text/html");
-			elementAttributes_d.addAttribute("", "", "mode", "", "escaped");
-			elementAttributes_d.addAttribute("", "", "xml:lang", "", "en");
-
-			transformerHandler_d.startElement("","","content",elementAttributes_d);
-			transformerHandler_d.startCDATA();
-			transformerHandler_d.characters(description.toCharArray(),0,description.length());
-			transformerHandler_d.endCDATA();
-			transformerHandler_d.endElement("","","content");
-
-			transformerHandler_d.endElement("","","entry");
-		}
-		catch (SAXException e) {
-			throw new FeedGenerationException(e);
-		}
-
-	}
-
-  /**
-	 * Closes the feed's main elements (i.e., "rss" and "channel").
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	close()
-		throws FeedGenerationException
-	{
-		try {
-			transformerHandler_d.endElement("","","feed");
-			transformerHandler_d.endDocument();
-		}
-		catch (SAXException e) {
-			throw new FeedGenerationException(e);
-		}
-	}
-
-	/**
-	 * Simple test to generate a 2.0 feed.
-	 */
-	public static
-	void
-	main(String[] args)
-	{
-		try {
-			AtomGenerator gen = new AtomGenerator();
-			gen.init(new PrintWriter(System.out));
-			gen.printHeader("Test feed", "http://something/", "test feed desc", "test@test.com", new Date());
-			gen.printItem("Item title 1", "Item <b>desc</b> 1", "http://guid/1234", new Date());
-			gen.printItem("Item title 2", "Item <b>desc</b> 2", "http://guid/12342", new Date());
-			gen.close();
-		}
-		catch (FeedGenerationException e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/rss/src/com/clevercactus/google/FeedGenerationException.java b/rss/src/com/clevercactus/google/FeedGenerationException.java
deleted file mode 100644
index fb33e0f..0000000
--- a/rss/src/com/clevercactus/google/FeedGenerationException.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-/**
- * Used to simplify exception handling in the RSSGenerator class. Internal
- * Exceptions in that class will be wrapped in an FeedGenerationException.
- *
- * @version 1.0, 29/08/2003
- * @author Diego Doval
- */
-public
-class FeedGenerationException
-	extends Exception
-{
-	public
-	FeedGenerationException()
-	{
-	}
-
-	public
-	FeedGenerationException(Throwable cause)
-	{
-		super(cause);
-	}
-
-	public
-	FeedGenerationException(String message)
-	{
-		super(message);
-	}
-
-	public
-	FeedGenerationException(String message, Throwable cause)
-	{
-		super(message, cause);
-	}
-}
diff --git a/rss/src/com/clevercactus/google/FeedGenerator.java b/rss/src/com/clevercactus/google/FeedGenerator.java
deleted file mode 100644
index 5879e6e..0000000
--- a/rss/src/com/clevercactus/google/FeedGenerator.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-import org.xml.sax.helpers.AttributesImpl;
-import org.xml.sax.SAXException;
-
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.sax.SAXTransformerFactory;
-import javax.xml.transform.sax.TransformerHandler;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.OutputKeys;
-import java.io.Writer;
-import java.util.Date;
-import java.util.Locale;
-import java.text.SimpleDateFormat;
-
-/**
- * A class that uses JAXP and SAX to print an feed to a PrintWriter.
- * Output of the actual happens as data is added on the subclass. See the main() method for a
- * simple usage example.
- *
- * @version 1.0, 29/08/2003
- * @author Diego Doval
- */
-public abstract
-class FeedGenerator
-{
-	protected Writer output_d;
-	protected StreamResult streamResult_d;
-	protected TransformerHandler transformerHandler_d;
-	protected SAXTransformerFactory saxTransformerFactory_d;
-	protected AttributesImpl elementAttributes_d;
-	protected AttributesImpl feedAttributes_d;
-
-	public static SimpleDateFormat iso8601DateFormat_sd = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
-	public static SimpleDateFormat rfc822DateFormat_sd = new SimpleDateFormat("EEE', 'dd' 'MMM' 'yy' 'HH:mm:ss' 'z", Locale.US);
-
-	/**
-	 * The one and only constructor.
-	 */
-	public
-	FeedGenerator()
-	{
-	}
-
-	/**
-	 * @param output writer to use for outputting the SearchResults
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	init(Writer output)
-		throws FeedGenerationException
-	{
-		output_d = output;
-		streamResult_d = new StreamResult(output_d);
-		feedAttributes_d = new AttributesImpl();
-		elementAttributes_d = new AttributesImpl();
-		try {
-			saxTransformerFactory_d = (SAXTransformerFactory) SAXTransformerFactory.newInstance();
-			transformerHandler_d = saxTransformerFactory_d.newTransformerHandler();
-			Transformer trans = transformerHandler_d.getTransformer();
-			trans.setOutputProperty(OutputKeys.ENCODING,"ISO-8859-1");
-			trans.setOutputProperty(OutputKeys.INDENT,"yes");
-			transformerHandler_d.setResult(streamResult_d);
-			transformerHandler_d.startDocument();
-		}
-		catch (Exception e) {
-			throw new FeedGenerationException(e);
-		}
-	}
-
-	/**
-	 * Prints a valid header based on the information passed.
-	 *
-	 * @param title feed title
-	 * @param link feed link
-	 * @param description feed description
-	 * @param author feed author (must be an email address)
-	 * @param lastBuildDate the date the feed was built
-	 * @throws FeedGenerationException
-	 */
-	public abstract
-	void
-	printHeader(String title, String link, String description, String author, Date lastBuildDate)
-		throws FeedGenerationException;
-
-	/**
-	 * Prints a valid SearchResults 2.0 item based on the information passed.
-	 *
-	 * @param title the entry title
-	 * @param description the entry body/description
-	 * @param link the entry's GUID
-	 * @param date the entry publication date
-	 * @throws FeedGenerationException
-	 */
-	public abstract
-	void
-	printItem(String title, String description, String link, Date date)
-		throws FeedGenerationException;
-
-  /**
-	 * Closes the feed's main elements
-	 * @throws FeedGenerationException
-	 */
-	public abstract
-	void
-	close()
-		throws FeedGenerationException;
-
-	/**
-	 * Utility method to obtain a date in a string in RFC 822 date format
-	 *
-	 * @param date the date to
-	 * @return a string with the date in RFC 822 format
-	 */
-	public final
-	String
-	getAsISO8601String(Date date)
-	{
-		String result = iso8601DateFormat_sd.format(date);
-		//convert 20030509T00:32:35+0100 returned by Java into 20030509T00:32:35+01:00
-		//from the spec <dateTime.iso8601>	date/time	19980717T14:08:55
-		result = result.substring(0, result.length()-2) + ":" + result.substring(result.length()-2);
-		return result;
-	}
-
-
-	/**
-	 * Utility method to obtain a date in a string in RFC 822 date format
-	 *
-	 * @param date the date to
-	 * @return a string with the date in RFC 822 format
-	 */
-	public final
-	String
-	getAsRFC822String(Date date)
-	{
-		return rfc822DateFormat_sd.format(date);
-	}
-}
diff --git a/rss/src/com/clevercactus/google/FeedGeneratorFactory.java b/rss/src/com/clevercactus/google/FeedGeneratorFactory.java
deleted file mode 100644
index a07fe81..0000000
--- a/rss/src/com/clevercactus/google/FeedGeneratorFactory.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-import java.util.HashMap;
-
-/**
- * Date: 05-Sep-2003
- * Time: 20:41:19
- */
-public
-class FeedGeneratorFactory
-{
-	public static HashMap feedTypes_sd = new HashMap();
-
-	public static final String FEED_TYPE_RSS = "rss";
-	public static final String FEED_TYPE_ATOM = "atom";
-
-	static {
-		addGenerator(FEED_TYPE_RSS, RSSGenerator.class);
-		addGenerator(FEED_TYPE_ATOM, AtomGenerator.class);
-	}
-
-	public static
-	boolean
-	supportsFormat(String type)
-	{
-		return type != null && (type.equals(FEED_TYPE_RSS) || type.equals(FEED_TYPE_ATOM));
-	}
-
-	public static
-	void
-	addGenerator(String type, Class cls)
-	{
-		feedTypes_sd.put(type, cls);
-	}
-
-	public static
-	FeedGenerator
-	getGeneratorForType(String type)
-	{
-		Class cls = (Class) feedTypes_sd.get(type);
-		try {
-			return (FeedGenerator) cls.newInstance();
-		}
-		catch (InstantiationException e) {
-			e.printStackTrace();
-		}
-		catch (IllegalAccessException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/rss/src/com/clevercactus/google/GoogleResultsWrapper.java b/rss/src/com/clevercactus/google/GoogleResultsWrapper.java
deleted file mode 100644
index 128ad70..0000000
--- a/rss/src/com/clevercactus/google/GoogleResultsWrapper.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-import com.google.soap.search.GoogleSearchResultElement;
-
-import java.io.Writer;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Date;
-import java.util.ArrayList;
-
-/**
- * Date: 30-Oct-2003
- * Time: 13:41:41
- * @author Diego Doval
- * @author Erik C. Thauvin
- */
-public
-class GoogleResultsWrapper
-{
-	ArrayList items_d = new ArrayList();
-
-
-	private
-	GoogleResultsWrapper()
-	{
-	}
-
-	private
-	Iterator
-	iterator()
-	{
-		return items_d.iterator();
-	}
-
-	private
-	void
-	addItem(GoogleResultsWrapperItem it)
-	{
-		items_d.add(it);
-	}
-
-	private static
-	GoogleResultsWrapper
-	createWrapper(GoogleSearchResultElement[] elements)
-	{
-		if (elements == null || elements.length == 0) {
-			return null;
-		}
-		GoogleResultsWrapper wrapper = new GoogleResultsWrapper();
-		for (int i = 0; i < elements.length; i++) {
-			GoogleSearchResultElement element = elements[i];
-			wrapper.addItem(new GoogleResultsWrapperItem(element.getTitle(), element.getURL(), element.getSnippet()));
-		}
-		return wrapper;
-	}
-
-	/**
-	 * Output the results to a writer.
-	 *
-	 * @param out the writer to use
-	 * @param elements the search result elements
-	 * @param query the search query
-	 * @param feedType the type of feed to use (options are "rss" and "atom")
-	 */
-	public static
-	void
-	outputResults(Writer out, GoogleSearchResultElement[] elements, String query, String feedType)
-	{
-		outputResults(out, createWrapper(elements), query, feedType);
-	}
-
-	/**
-	 * Output the results to a writer.
-	 *
-	 * @param out the writer to use
-	 * @param wrapper the results object obtained from the parsing of results
-	 * @param query the search query
-	 * @param feedType the type of feed to use (options are "rss" and "atom")
-	 */
-	private static
-	void
-	outputResults(Writer out, GoogleResultsWrapper wrapper, String query, String feedType)
-	{
-		try {
-			if (out == null || feedType == null) {
-				try {
-					out.write("Null parameter in output results.\n");
-				}
-				catch (IOException e1) {
-				}
-				return;
-			}
-			if (!feedType.equals(FeedGeneratorFactory.FEED_TYPE_RSS)
-						&& !feedType.equals(FeedGeneratorFactory.FEED_TYPE_ATOM)) {
-				try {
-					out.write("Invalid feed type ("+feedType+"). Supported types are 'rss' and 'atom'.\n");
-				}
-				catch (IOException e1) {
-				}
-				return;
-			}
-			try {
-				FeedGenerator gen = FeedGeneratorFactory.getGeneratorForType(feedType);
-				gen.init(out);
-				Date date = new Date();
-
-				String description;
-				if ((query == null) || (query.trim().length() == 0)) {
-					description = "Google Tag Library";
-				} else {
-					description = "Search results for: \"" + query + '"';
-				}
-
-				gen.printHeader("Google Search Feed Output", "http://google-taglib.sourceforge.net/", description, "check@page.for.info", date);
-				if (wrapper != null) {
-					Iterator items = wrapper.iterator();
-					while (items.hasNext()) {
-						GoogleResultsWrapperItem item = (GoogleResultsWrapperItem) items.next();
-						gen.printItem(item.getTitle(), item.getSnippet(), item.getURL(), date);
-					}
-				}
-				gen.close();
-			}
-			catch (FeedGenerationException e) {
-				try {
-					out.write("Error.\n");
-					out.write(e.getMessage());
-				}
-				catch (IOException e1) {
-				}
-			}
-		}
-		finally {
-			try {
-				out.close();
-			}
-			catch (IOException e) {
-			}
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/rss/src/com/clevercactus/google/GoogleResultsWrapperItem.java b/rss/src/com/clevercactus/google/GoogleResultsWrapperItem.java
deleted file mode 100644
index 848c216..0000000
--- a/rss/src/com/clevercactus/google/GoogleResultsWrapperItem.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-/**
- * Date: 30-Oct-2003
- * Time: 13:51:43
- * @author Diego Doval
- */
-public
-class GoogleResultsWrapperItem
-{
-	String title_d;
-	String text_d;
-	String url_d;
-
-	public
-	GoogleResultsWrapperItem(String title, String url, String text)
-	{
-		title_d = title;
-		url_d = url;
-		text_d = text;
-	}
-
-	public
-	String
-	getTitle()
-	{
-		return title_d;
-	}
-
-	public
-	String
-	getSnippet()
-	{
-		return text_d;
-	}
-
-	public
-	String
-	getURL()
-	{
-		return url_d;
-	}
-
-	public
-	String
-	toString()
-	{
-		return "Title: "+title_d+"\nURL:"+url_d+"\nText:"+text_d+"\n";
-	}
-}
diff --git a/rss/src/com/clevercactus/google/RSSGenerator.java b/rss/src/com/clevercactus/google/RSSGenerator.java
deleted file mode 100644
index e6a4b25..0000000
--- a/rss/src/com/clevercactus/google/RSSGenerator.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- *  Copyright (c) 2003-2004 clevercactus ltd.
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-package com.clevercactus.google;
-
-import org.xml.sax.SAXException;
-
-import java.io.PrintWriter;
-import java.util.Date;
-
-/**
- * A class that uses JAXP and SAX to print an SearchResults 2.0 feed to a PrintWriter.
- * Output of the SearchResults happens as data is added. See the main() method for a
- * simple usage example.
- *
- * @version 1.0, 29/08/2003
- * @author Diego Doval
- */
-public
-class RSSGenerator
-	extends FeedGenerator
-{
-
-	/**
-	 * The one and only constructor.
-	 */
-	public
-	RSSGenerator()
-	{
-	}
-
-	/**
-	 * Prints a valid SearchResults 2.0 header based on the information passed.
-	 *
-	 * @param title feed title
-	 * @param link feed link
-	 * @param description feed description
-	 * @param author feed author (must be an email address)
-	 * @param lastBuildDate the date the feed was built
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	printHeader(String title, String link, String description, String author, Date lastBuildDate)
-		throws FeedGenerationException
-	{
-		try {
-			String language = "en-us";
-			String generator = "clevercactus rss generator 1.0";
-
-			feedAttributes_d.clear();
-			feedAttributes_d.addAttribute("", "", "version", "", "2.0");
-			transformerHandler_d.startElement("","","rss",feedAttributes_d);
-			feedAttributes_d.clear();
-			transformerHandler_d.startElement("","","channel",feedAttributes_d);
-			transformerHandler_d.startElement("","","title",feedAttributes_d);
-			transformerHandler_d.characters(title.toCharArray(),0,title.length());
-			transformerHandler_d.endElement("","","title");
-			transformerHandler_d.startElement("","","link",feedAttributes_d);
-			transformerHandler_d.characters(link.toCharArray(),0,link.length());
-			transformerHandler_d.endElement("","","link");
-			transformerHandler_d.startElement("","","description", feedAttributes_d);
-			transformerHandler_d.characters(description.toCharArray(),0,description.length());
-			transformerHandler_d.endElement("","","description");
-			transformerHandler_d.startElement("","","language", feedAttributes_d);
-			transformerHandler_d.characters(language.toCharArray(),0,language.length());
-			transformerHandler_d.endElement("","","language");
-			transformerHandler_d.startElement("","","lastBuildDate",elementAttributes_d);
-			String dtString = getAsRFC822String(lastBuildDate);
-			transformerHandler_d.characters(dtString.toCharArray(),0,dtString.length());
-			transformerHandler_d.endElement("","","lastBuildDate");
-			transformerHandler_d.startElement("","","generator", feedAttributes_d);
-			transformerHandler_d.characters(generator.toCharArray(),0,generator.length());
-			transformerHandler_d.endElement("","","generator");
-			transformerHandler_d.startElement("","","managingEditor", feedAttributes_d);
-			transformerHandler_d.characters(author.toCharArray(),0,author.length());
-			transformerHandler_d.endElement("","","managingEditor");
-			transformerHandler_d.startElement("","","webMaster", feedAttributes_d);
-			transformerHandler_d.characters(author.toCharArray(),0,author.length());
-			transformerHandler_d.endElement("","","webMaster");
-		}
-		catch (SAXException e) {
-			throw new FeedGenerationException(e);
-		}
-	}
-
-	/**
-	 * Prints a valid SearchResults 2.0 item based on the information passed.
-	 *
-	 * @param title the entry title
-	 * @param description the entry body/description
-	 * @param link the entry's GUID
-	 * @param date the entry publication date
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	printItem(String title, String description, String link, Date date)
-		throws FeedGenerationException
-	{
-		try {
-			elementAttributes_d.clear();
-			transformerHandler_d.startElement("","","item",elementAttributes_d);
-			elementAttributes_d.clear();
-			transformerHandler_d.startElement("","","title",elementAttributes_d);
-			transformerHandler_d.characters(title.toCharArray(),0,title.length());
-			transformerHandler_d.endElement("","","title");
-			elementAttributes_d.clear();
-			transformerHandler_d.startElement("","","description",elementAttributes_d);
-			transformerHandler_d.characters(description.toCharArray(),0,description.length());
-			transformerHandler_d.endElement("","","description");
-			elementAttributes_d.clear();
-			transformerHandler_d.startElement("","","pubDate",elementAttributes_d);
-			String dtString = getAsRFC822String(date);
-			transformerHandler_d.characters(dtString.toCharArray(),0,dtString.length());
-			transformerHandler_d.endElement("","","pubDate");
-			elementAttributes_d.clear();
-			transformerHandler_d.startElement("","","link",elementAttributes_d);
-			transformerHandler_d.characters(link.toCharArray(),0,link.length());
-			transformerHandler_d.endElement("","","link");
-
-			transformerHandler_d.endElement("","","item");
-		}
-		catch (SAXException e) {
-			throw new FeedGenerationException(e);
-		}
-
-	}
-
-  /**
-	 * Closes the feed's main elements (i.e., "rss" and "channel").
-	 * @throws FeedGenerationException
-	 */
-	public
-	void
-	close()
-		throws FeedGenerationException
-	{
-		try {
-			transformerHandler_d.endElement("","","channel");
-			transformerHandler_d.endElement("","","rss");
-			transformerHandler_d.endDocument();
-		}
-		catch (SAXException e) {
-			throw new FeedGenerationException(e);
-		}
-	}
-
-
-	/**
-	 * Simple test to generate a 2.0 feed.
-	 */
-	public static
-	void
-	main(String[] args)
-	{
-		try {
-			RSSGenerator gen = new RSSGenerator();
-			gen.init(new PrintWriter(System.out));
-			gen.printHeader("Test feed", "http://something/", "test feed desc", "test@test.com", new Date());
-			gen.printItem("Item title 1", "Item desc 1", "guid", new Date());
-			gen.printItem("Item title 2", "Item desc 2", "guid", new Date());
-			gen.close();
-		}
-		catch (FeedGenerationException e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/rss/src/com/clevercactus/google/taglibs/SearchResults.java b/rss/src/com/clevercactus/google/taglibs/SearchResults.java
deleted file mode 100644
index 61f44f0..0000000
--- a/rss/src/com/clevercactus/google/taglibs/SearchResults.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * @(#)SearchResults.java
- *
- *  Copyright (c) 2003-2004, Erik C. Thauvin (erik@thauvin.net)
- *  All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are
- *  met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *
- *  Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation
- *  and/or other materials provided with the distribution.
- *
- *  Neither the name of the author nor the names of its contributors may be
- *  used to endorse or promote products derived from this software without
- *  specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- *  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  $Id$
- *
- */
-package com.clevercactus.google.taglibs;
-
-import com.clevercactus.google.GoogleResultsWrapper;
-
-import net.thauvin.google.GoogleSearchBean;
-import net.thauvin.google.TagUtility;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-
-/**
- * A custom tag used to display Google search results in RSS format.
- *
- * @author Erik C. Thauvin
- * @version $Revision$, $Date$
- *
- * @created Oct 30, 2003
- * @since 1.0
- */
-public class SearchResults extends BodyTagSupport
-{
-	/**
-	 * The Google search bean.
-	 */
-	protected GoogleSearchBean bean = null;
-
-	/**
-	 * doEndTag method.
-	 *
-	 * @return EVAL_PAGE
-	 *
-	 * @throws JspException
-	 */
-	public int doEndTag() throws JspException
-	{
-		try
-		{
-			// Is the result valid?
-			if (bean != null)
-			{
-				// Output the feed
-				GoogleResultsWrapper.outputResults(pageContext.getOut(),
-												   bean.getResultElements(),
-												   bean.getResultProperty("searchKeywords"),
-												   "rss");
-			}
-		}
-		catch (Exception e)
-		{
-			throw TagUtility.outputError("rss", e);
-		}
-
-		// Reset the values
-		reset();
-
-		return EVAL_PAGE;
-	}
-
-	/**
-	 * doStartTag method.
-	 *
-	 * @return SKIP_BODY.
-	 *
-	 * @throws JspException
-	 */
-	public int doStartTag() throws JspException
-	{
-		// Get the Google bean
-		bean = TagUtility.getGoogleSearchBean(pageContext);
-
-		return SKIP_BODY;
-	}
-
-	/**
-	 * Release method.
-	 */
-	public void release()
-	{
-		super.release();
-
-		// Reset the bean
-		bean = null;
-
-		// Reset the values
-		reset();
-	}
-
-	/**
-	 * Reset the values.
-	 */
-	protected void reset()
-	{
-		// super.reset();
-	}
-}
diff --git a/rss/tlds/google-rss.tld b/rss/tlds/google-rss.tld
deleted file mode 100644
index 06ee349..0000000
--- a/rss/tlds/google-rss.tld
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- Tag library descriptor -->
-<taglib>
-	<!-- The version number of this tag library -->
-	<tlibversion>@version@</tlibversion>
-	<!-- The JSP specification version required to function -->
-	<jspversion>1.1</jspversion>
-	<!-- The short name of this tag library -->
-	<shortname>google-rss</shortname>
-	<!-- Public URI that uniquely identifies this version of the tag library -->
-	<uri>http://www.thauvin.net/taglibs/google-rss-taglib-@version@</uri>
-	<!-- General information about this tag library -->
-	<info>The Google RSS Tag Library.</info>
-	<!-- SearchResults Tag -->
-	<tag>
-		<name>searchResults</name>
-		<tagclass>com.clevercactus.google.taglibs.SearchResults</tagclass>
-		<bodycontent>empty</bodycontent>
-		<info>Displays Google search results in RSS format.</info>
-	</tag>
-</taglib>
diff --git a/tlds/google-1.2.tld b/tlds/google-1.2.tld
deleted file mode 100644
index 2310b72..0000000
--- a/tlds/google-1.2.tld
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_2.dtd">
-<!-- Tag library descriptor -->
-<taglib>
-	<!-- The version number of this tag library -->
-	<tlib-version>@version@</tlib-version>
-	<!-- The JSP specification version required to function -->
-	<jsp-version>1.2</jsp-version>
-	<!-- The short name of this tag library -->
-	<short-name>google</short-name>
-	<!-- Public URI that uniquely identifies this version of the tag library -->
-	<uri>http://www.thauvin.net/taglibs/google-taglib-@version@</uri>
-	<!-- General information about this tag library -->
-	<description>The Google Tag Library.</description>
-	<!-- CachedPage Tag -->
-	<tag>
-		<name>cachedPage</name>
-		<tag-class>net.thauvin.google.taglibs.CachedPage</tag-class>
-		<body-content>JSP</body-content>
-		<description>Displays a page cached by Google.</description>
-		<attribute>
-			<name>key</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the authentication key.</description>
-		</attribute>
-	</tag>
-	<!-- Element Tag -->
-	<tag>
-		<name>element</name>
-		<tag-class>net.thauvin.google.taglibs.Element</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the given property of the current search result element.</description>
-		<attribute>
-			<name>css</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's class attribute.</description>
-		</attribute>
-		<attribute>
-			<name>name</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the desired property of the current result set item.</description>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's style attribute.</description>
-		</attribute>
-		<attribute>
-			<name>target</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's target attribute.</description>
-		</attribute>
-	</tag>
-	<!-- EndIndex Tag -->
-	<tag>
-		<name>endIndex</name>
-		<tag-class>net.thauvin.google.taglibs.EndIndex</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the current search result end index.</description>
-	</tag>
-	<!-- EstimatedTotal Tag -->
-	<tag>
-		<name>estimatedTotal</name>
-		<tag-class>net.thauvin.google.taglibs.EstimatedTotal</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the estimated total results count of the current search.</description>
-	</tag>
-	<!-- Next Tag -->
-	<tag>
-		<name>next</name>
-		<tag-class>net.thauvin.google.taglibs.Next</tag-class>
-		<body-content>JSP</body-content>
-		<description>Displays a link to the next search result set.</description>
-		<attribute>
-			<name>css</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's class attribute.</description>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's style attribute.</description>
-		</attribute>
-		<attribute>
-			<name>target</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's target attribute.</description>
-		</attribute>
-	</tag>
-	<!-- Previous Tag -->
-	<tag>
-		<name>previous</name>
-		<tag-class>net.thauvin.google.taglibs.Previous</tag-class>
-		<body-content>JSP</body-content>
-		<description>Displays a link to the previous search result set.</description>
-		<attribute>
-			<name>css</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's class attribute.</description>
-		</attribute>
-		<attribute>
-			<name>style</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's style attribute.</description>
-		</attribute>
-		<attribute>
-			<name>target</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the HTML link's target attribute.</description>
-		</attribute>
-	</tag>
-	<!-- Search Tag -->
-	<tag>
-		<name>search</name>
-		<tag-class>net.thauvin.google.taglibs.Search</tag-class>
-		<body-content>JSP</body-content>
-		<description>Performs a Google search.</description>
-		<attribute>
-			<name>cache</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies whether results are cached between search requests.</description>
-		</attribute>
-		<attribute>
-			<name>filter</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Activates or deactivates automatic results filtering.</description>
-		</attribute>
-		<attribute>
-			<name>key</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the authentication key.</description>
-		</attribute>
-		<attribute>
-			<name>lr</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Restricts the search to documents within one or more languages.</description>
-		</attribute>
-		<attribute>
-			<name>maxResults</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the number of results desired per query.</description>
-		</attribute>
-		<attribute>
-			<name>restrict</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Restricts the search to a subset of the Google web index.</description>
-		</attribute>
-		<attribute>
-			<name>safeSearch</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Enables filtering of adult content in the search results.</description>
-		</attribute>
-		<attribute>
-			<name>site</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Restricts the search to documents within the specified site.</description>
-		</attribute>
-		<attribute>
-			<name>start</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the index of the first desired result.</description>
-		</attribute>
-		<attribute>
-			<name>type</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the file type to be searched.</description>
-		</attribute>
-	</tag>
-	<!-- SearchComments Tag -->
-	<tag>
-		<name>searchComments</name>
-		<tag-class>net.thauvin.google.taglibs.SearchComments</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the current search comments.</description>
-	</tag>
-	<!-- SearchQuery Tag -->
-	<tag>
-		<name>searchQuery</name>
-		<tag-class>net.thauvin.google.taglibs.SearchQuery</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the current search query.</description>
-		<attribute>
-			<name>type</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies whether the search keywords or full query should be returned.</description>
-		</attribute>
-	</tag>
-	<!-- SearchResult Tag -->
-	<tag>
-		<name>searchResult</name>
-		<tag-class>net.thauvin.google.taglibs.SearchResult</tag-class>
-		<body-content>JSP</body-content>
-		<description>Loops through the current search results</description>
-	</tag>
-	<!-- SearchTime Tag -->
-	<tag>
-		<name>searchTime</name>
-		<tag-class>net.thauvin.google.taglibs.SearchTime</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the elapsed time of the current search.</description>
-	</tag>
-	<!-- SearchTips Tag -->
-	<tag>
-		<name>searchTips</name>
-		<tag-class>net.thauvin.google.taglibs.SearchTips</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the search tips of the current search.</description>
-	</tag>
-	<!-- Spelling Tag -->
-	<tag>
-		<name>spelling</name>
-		<tag-class>net.thauvin.google.taglibs.Spelling</tag-class>
-		<body-content>JSP</body-content>
-		<description>Performs a Google spelling suggestion.</description>
-		<attribute>
-			<name>key</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-			<description>Specifies the authentication key.</description>
-		</attribute>
-	</tag>
-	<!-- StartIndex Tag -->
-	<tag>
-		<name>startIndex</name>
-		<tag-class>net.thauvin.google.taglibs.StartIndex</tag-class>
-		<body-content>empty</body-content>
-		<description>Displays the current search result start index.</description>
-	</tag>
-</taglib>