diff --git a/.cvsignore b/.cvsignore
index e69de29..7279479 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+jline-0.9.9.zip
diff --git a/CatalogManager.properties b/CatalogManager.properties
new file mode 100644
index 0000000..f68f3e2
--- /dev/null
+++ b/CatalogManager.properties
@@ -0,0 +1,61 @@
+######################################################################## 
+# CatalogManager provides an interface to the catalog properties.
+# Properties can come from two places: from system properties or
+# from a CatalogManager.properties file. This class provides a
+# transparent interface to both, with system properties preferred 
+# over property file values.
+
+#######################################################################
+# Catalog Files:
+# The semicolon-delimited list of catalog files.
+# Example: catalogs=./xcatalog;/share/doctypes/catalog
+
+catalogs=/etc/xml/catalog;/etc/sgml/catalog
+
+#######################################################################
+# Relative Catalogs:
+# If false, relative catalog URIs are made absolute with respect to the
+# base URI of the CatalogManager.properties file. This setting only 
+# applies to catalog URIs obtained from the catalogs property in the
+# CatalogManager.properties file
+# Example: relative-catalogs = [yes|no]
+
+relative-catalogs=yes
+
+#######################################################################
+# Verbosity:
+# If non-zero, the Catalog classes will print informative and debugging
+# messages. The higher the number, the more messages.
+# Example: verbosity = [0..99]
+
+verbosity=0
+
+#######################################################################
+# Prefer:
+# Which identifier is preferred, "public" or "system"?
+# Example: xml.catalog.prefer = [public|system]
+
+prefer=system
+
+#######################################################################
+# Static-catalog:
+# Should a single catalog be constructed for all parsing, or should a
+# different catalog be created for each parser?
+# Example: static-catalog = [yes|no]
+
+static-catalog=yes
+
+#######################################################################
+# Allow-oasis-xml-catalog-pi
+# If the source document contains "oasis-xml-catalog" processing 
+# instructions, should they be used?
+# Example: allow-oasis-xml-catalog-pi = [yes|no]
+
+allow-oasis-xml-catalog-pi=yes
+
+#######################################################################
+# catalog-class-name
+# If you're using the convenience classes 
+# org.apache.xml.resolver.tools.*, this setting allows you to specify
+# an alternate class name to use for the underlying catalog.
+# Example: catalog-class-name=org.apache.xml.resolver.Resolver
diff --git a/jline-build.xml b/jline-build.xml
new file mode 100644
index 0000000..c40585c
--- /dev/null
+++ b/jline-build.xml
@@ -0,0 +1,86 @@
+<!-- this file is generated using the maven2 ant:ant task-->
+
+<project name="jline" default="jar" basedir=".">
+  <property file="${user.home}/.m2/maven.properties"/>
+  <property name="maven.build.output" value="target/classes"/>
+  <property name="maven.build.directory" value="target"/>
+  <property name="maven.build.final.name" value="jline-0.9.9"/>
+  <property name="maven.test.reports" value="${maven.build.directory}/test-reports"/>
+  <property name="maven.test.output" value="target/test-classes"/>
+  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+  <path id="build.classpath">
+    <fileset dir="${maven.repo.local}">
+      <include name="junit/junit/3.8.1/junit-3.8.1.jar"/>
+    </fileset>
+  </path>
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${maven.build.directory}"/>
+  </target>
+  <target name="compile" depends="get-deps" description="Compile the code">
+    <mkdir dir="${maven.build.output}"/>
+    <javac destdir="${maven.build.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/main/java"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${maven.build.output}">
+      <fileset dir="src/main/resources"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile,test" description="Clean the JAR">
+    <jar jarfile="${maven.build.directory}/${maven.build.final.name}.jar" basedir="${maven.build.output}" excludes="**/package.html"/>
+  </target>
+  <target name="compile-tests" depends="junit-present, compile" description="Compile the test code" if="junit.present">
+    <mkdir dir="${maven.test.output}"/>
+    <javac destdir="${maven.test.output}" excludes="**/package.html" debug="true" deprecation="true" optimize="false">
+      <src>
+        <pathelement location="src/test/java"/>
+      </src>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+      </classpath>
+    </javac>
+    <copy todir="${maven.test.output}">
+      <fileset dir="src/test/resources"/>
+    </copy>
+  </target>
+  <target name="test" depends="junit-present, compile-tests" if="junit.present" description="Run the test cases">
+    <mkdir dir="${maven.test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.classpath"/>
+        <pathelement location="${maven.build.output}"/>
+        <pathelement location="${maven.test.output}"/>
+      </classpath>
+      <batchtest todir="${maven.test.reports}">
+        <fileset dir="src/test/java">
+          <include name="**/*Test.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present"/>
+  </target>
+  <target name="junit-present" depends="test-junit-present" unless="junit.present">
+    <echo>================================= WARNING ================================</echo>
+    <echo> Junit isn&apos;t present in your $ANT_HOME/lib directory. Tests not executed. </echo>
+    <echo>==========================================================================</echo>
+  </target>
+  <target name="test-offline">
+    <condition property="maven.mode.offline">
+      <equals arg1="${build.sysclasspath}" arg2="only"/>
+    </condition>
+  </target>
+  <target name="get-deps" depends="test-offline" description="Download all dependencies" unless="maven.mode.offline">
+    <mkdir dir="${maven.repo.local}"/>
+    <get src="http://jline.sourceforge.net/m2repo/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"/>
+  </target>
+</project>
diff --git a/jline.spec b/jline.spec
new file mode 100644
index 0000000..6854207
--- /dev/null
+++ b/jline.spec
@@ -0,0 +1,245 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+# 3. Neither the name of the JPackage Project 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.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define _without_maven 1
+
+%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
+%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
+
+%define cvs_version     0.9.9
+%define repo_dir    .m2/repository
+
+Name:           jline
+Version:        0.9.9
+Release:        1jpp.1%{?dist}
+Epoch:          0
+Summary:        Java library for reading and editing user input in console applications
+License:        BSD
+URL:            http://jline.sf.net/
+Group:          Development/Libraries
+Source0:        http://download.sourceforge.net/sourceforge/jline/jline-%{cvs_version}.zip
+Source1:        CatalogManager.properties
+Source2:        jline-build.xml
+Requires:       /bin/sh
+Requires:       /bin/stty
+BuildRequires:  jpackage-utils >= 0:1.7
+%if %{with_maven}
+BuildRequires:  xml-commons-resolver
+BuildRequires:  maven2
+BuildRequires:  maven2-plugin-resources
+BuildRequires:  ant-apache-resolver
+%else
+BuildRequires:  ant
+BuildRequires:  junit
+%endif
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%if %{gcj_support}
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description
+JLine is a java library for reading and editing user input in console
+applications. It features tab-completion, command history, password
+masking, customizable keybindings, and pass-through handlers to use to
+chain to other console applications.
+
+%package        demo
+Summary:        Demos for %{name}
+Group:          Development/Documentation
+
+%if %{gcj_support}
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description    demo
+Demonstrations and samples for %{name}.
+
+# FIXME: the maven ant:ant generated build.xml file does not contain 
+#        a javadoc task
+%if %{with_maven}
+%package        javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
+
+%if %{gcj_support}
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
+%endif
+
+%description    javadoc
+Javadoc for %{name}.
+%endif
+
+%prep
+# BEWARE: The jar file META-INF is not under the subdir
+%setup -q -c -n %{name}-%{cvs_version}
+cp -pr %{name}-%{cvs_version}/* .
+rm -fr %{name}-%{cvs_version}
+
+# Use locally installed DTDs
+mkdir %{_builddir}/%{name}-%{cvs_version}/build
+cp -p %SOURCE1 %{_builddir}/%{name}-%{cvs_version}/build/
+
+cp -p %{SOURCE2} src/build.xml
+
+%build
+mkdir -p native
+# Now done by Patch0 for documentation purposes
+#perl -p -i -e 's|^.*<attribute name="Class-Path".*||' build.xml
+
+# Use locally installed DTDs
+export CLASSPATH=%{_builddir}/%{name}-%{cvs_version}/build
+
+cd src/
+
+%if %{with_maven}
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+
+mvn-jpp \
+        -e \
+                -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+                -Dmaven.test.failure.ignore=true \
+        install javadoc:javadoc
+%else
+mkdir -p $(pwd)/.m2/repository
+build-jar-repository $(pwd)/.m2/repository junit
+export CLASSPATH=target/classes
+ant -Dbuild.sysclasspath="only" -Duser.home=$(pwd) 
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+for jar in $(find -type f -name "*.jar" | grep -E target/.*.jar); do
+        install -m 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+done
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
+ln -sf ${jar} ${jar/-%{version}/}; done)
+
+# the maven ant:ant task did not generate a build.xml file with a javadoc task
+%if %{with_maven}
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+for target in $(find -type d -name target); do
+        install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:jline-::g`
+        cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:jline-::g`
+done
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} 
+%endif
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_DIR/META-INF
+
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%files
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%doc LICENSE.txt
+
+%if %{with_maven}
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jline-0.9.9.jar.*
+%endif
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%doc %{_javadocdir}/*
+%endif
+
+#FIXME: add javadoc support to generated build.xml
+
+%if %{gcj_support}
+%dir %attr(-,root,root) %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jline-0.9.9.jar.*
+%endif
+
+%changelog
+* Tue Mar 06 2007 Matt Wringe <mwringe@redhat.com> - 0:0.9.9-1jpp.1
+- Add option to build with ant.
+- Fix various rpmlint issues
+- Specify proper license
+
+* Thu May 04 2006 Alexander Kurtakov <akurtkov at gmail.com> - 0:0.9.9-1jpp
+- Upgrade to 0.9.9
+
+* Thu May 04 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.9.5-1jpp
+- Upgrade to 0.9.5
+- First JPP-1.7 release
+
+* Mon Apr 25 2005 Fernando Nasser <fnasser@redhat.com> - 0:0.9.1-1jpp
+- Upgrade to 0.9.1
+- Disable attempt to include external jars
+
+* Mon Apr 25 2005 Fernando Nasser <fnasser@redhat.com> - 0:0.8.1-3jpp
+- Changes to use locally installed DTDs
+- Do not try and access sun site for linking javadoc
+
+* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:0.8.1-2jpp
+- Rebuild with ant-1.6.2
+
+* Mon Jan 26 2004 David Walluck <david@anti-microsoft.org> 0:0.8.1-1jpp
+- release
diff --git a/sources b/sources
index e69de29..b59fe84 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c5164fb17d33315fa2c1ad10ab84aef7  jline-0.9.9.zip