diff --git a/genjava/.DS_Store b/genjava/.DS_Store
new file mode 100644
index 00000000..4950ea96
Binary files /dev/null and b/genjava/.DS_Store differ
diff --git a/genjava/FUTURE b/genjava/FUTURE
new file mode 100644
index 00000000..9b21e203
--- /dev/null
+++ b/genjava/FUTURE
@@ -0,0 +1,61 @@
+Split-off:
+
+gj-csv
+gj-xml
+gj-scrape
+gj-tools
+gj-core
+gj-mail
+gj-beans
+
+REMOVE
+-
+src/java/com/generationjava/security
+
+gj-core 3.0
+-----------
+
+src/java/com/generationjava/compare
+src/java/com/generationjava/random
+
+src/java/com/generationjava/collections
+
+src/java/com/generationjava/io/
+src/java/com/generationjava/io/find
+src/java/com/generationjava/lang
+src/java/com/generationjava/math       - fold back into the old repo. useless
+src/java/com/generationjava/net
+src/java/com/generationjava/util
+
+src/java/com/generationjava/jdbc       - does dbutils replace this?
+
+
+gj-tools 1.0
+------------
+src/java/com/generationjava/tools
+src/java/com/generationjava/net/WGet   - Goes to Tools instance?
+
+gj-scrape 1.0
+-------------
+src/java/com/generationjava/web
+src/java/com/generationjava/scrape
+
+gj-csv 1.0
+----------
+src/java/com/generationjava/io/Csv
+
+gj-xml 1.0
+----------
+src/java/com/generationjava/io/xml
+
+gj-mail 1.0
+-----------
+src/java/com/generationjava/mail
+
+gj-beans 1.0
+------------
+src/java/com/generationjava/beans
+
+gj-j2ee  [ not core, yet ]
+-------
+src/java/com/generationjava/servlet
diff --git a/genjava/LICENSE.txt b/genjava/LICENSE.txt
new file mode 100644
index 00000000..38aecf65
--- /dev/null
+++ b/genjava/LICENSE.txt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
diff --git a/genjava/gj-beans/project.properties b/genjava/gj-beans/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-beans/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-beans/project.xml b/genjava/gj-beans/project.xml
new file mode 100755
index 00000000..e9500e33
--- /dev/null
+++ b/genjava/gj-beans/project.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-beans</id>
+  <name>GenJava-Beans</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    BeanViewer. Similar to Jakarta BeanUtils and thus deprecated in favour of that code.
+  </description>
+  
+  <shortDescription>BeanViewer</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>gj-core</id>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+    </dependency>
+    <dependency>
+      <id>junit</id>
+      <version>3.7</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/AbstractBeanViewer.java b/genjava/gj-beans/src/java/com/generationjava/beans/AbstractBeanViewer.java
new file mode 100644
index 00000000..cfd91ea6
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/AbstractBeanViewer.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.beans;
+
+import java.util.List;
+import java.util.Enumeration;
+import java.util.Iterator;
+
+import org.apache.commons.collections.CollectionUtils;
+
+/**
+ * Helps us deal with such wonderful things as array notation 
+ * and object notation. Array notation may use associative array notation.
+ *
+ * @date 2001-06-14
+ */
+abstract public class AbstractBeanViewer {
+
+    /**
+     * Get the property of myBean with the name of the key's toString.
+     *
+     * The key may use dotted notation to imply a property in a property 
+     * and array notation to get the nth property in a list of propertys.
+     */
+    public Object get(Object key, Object myBean) {
+        if( key == null ) {
+            return null;
+        }
+
+        if(myBean == null) {
+            return null;
+        }
+
+        String name = key.toString();
+
+        BeanViewRuntime runtime = new BeanViewRuntime();
+        runtime.pushObject(myBean);
+
+        int idx = 0;
+        Object obj = myBean;
+        while( (idx = name.indexOf('.', idx)) != -1) {
+            String pre = name.substring(0, idx);
+            name = name.substring(idx+1);
+            if(obj != null) {
+                obj = handleGet(runtime, obj, pre);
+                runtime.pushObject(obj);
+            } else {
+                return null;
+            }
+        }
+
+        return handleGet(runtime, obj, name);
+    }
+
+    /**
+     * Give a bean, and a String name, get the property with that name 
+     * from the bean.
+     * Does not handle dot notation, but does handle array notation 
+     * and associative array notation.
+     */
+    public Object handleGet(BeanViewRuntime runtime, Object bean, String name) {
+        // deal with array
+        int i = name.indexOf('[');
+        Object index = null;
+        if(i != -1) {
+            String pre = name.substring(i+1);
+            if(pre.endsWith("]")) {
+                pre = pre.substring(0, pre.length() -1);
+            }
+            try {
+                index = Integer.valueOf(pre);
+            } catch(NumberFormatException nfe) {
+                index = pre;
+            }
+            name = name.substring(0,i);
+        }
+
+        // shouldn't be null
+        if(name.equals("")) {
+            return CollectionUtils.index(bean, index);
+        } else {
+            return invokeGet( runtime, bean, name, index );
+        }
+    }
+
+    /**
+     * Get a value from a bean with the specified name.
+     * If the bean is indexed, an int index is passed. Else it is -1.
+     * It is recommmended that implementors of this method use the 
+     * index method to handle the array notation.
+     */
+    abstract public Object invokeGet(BeanViewRuntime runtime, Object bean, String name, Object idx);
+
+    public Object set(Object key, Object bean, Object value) {
+        if(key == null) {
+            return null;
+        }
+
+        if(bean == null) {
+            return null;
+        }
+
+        String name = key.toString();
+
+        int idx = name.lastIndexOf(".");
+        if(idx != -1) {
+            String pre = name.substring(0, idx);
+            String post = name.substring(idx+1);
+            Object parent = get(pre, bean);
+// TODO: remove [] notation from name.
+// equally, need to pass idx as an Object, so implies that 
+// invokeGet shuld have Object idx and so should index.
+            bean = parent;
+            name = post;
+        }
+        // call invokeGet to get the current value, then 
+        // call invokeSet
+        invokeSet(null, bean, name, null, value);
+
+        // return old value
+        return null;
+    }
+
+    abstract public void invokeSet(BeanViewRuntime runtime, Object bean, String name, Object idx, Object value);
+
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/BeanImplProxy.java b/genjava/gj-beans/src/java/com/generationjava/beans/BeanImplProxy.java
new file mode 100644
index 00000000..64b5cde0
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/BeanImplProxy.java
@@ -0,0 +1,76 @@
+package com.generationjava.beans;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import com.generationjava.namespace.Namespace;
+import com.generationjava.namespace.SimpleNamespace;
+
+import org.apache.commons.lang.StringUtils;
+
+public class BeanImplProxy implements InvocationHandler {
+
+    public static Object newInstance(Class intfce) {
+        BeanImplProxy handler = new BeanImplProxy(intfce);
+        Class proxyClass = Proxy.getProxyClass(
+            intfce.getClassLoader(), 
+            new Class[] { intfce }
+            );
+        try { 
+            return proxyClass.getConstructor( new Class[] { InvocationHandler.class }
+            ).newInstance(new Object[] { handler });
+        } catch(NoSuchMethodException nsme) {
+            nsme.printStackTrace();
+        } catch(SecurityException se) {
+            se.printStackTrace();
+        } catch(InstantiationException ie) {
+            ie.printStackTrace();
+        } catch(IllegalAccessException iae) {
+            iae.printStackTrace();
+        } catch(InvocationTargetException ite) {
+            ite.printStackTrace();
+        }
+        return null;
+    }
+
+    private Class type;
+    private Namespace namespace;
+
+    private BeanImplProxy(Class type) {
+        this.type = type;
+        this.namespace = new SimpleNamespace();
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        Class returnType = method.getReturnType();
+        String name = method.getName();
+        if(returnType == Void.TYPE) {
+            // test this
+            if(name.startsWith("set")) {
+                if(args.length == 1) {
+                    String property = StringUtils.uncapitalise(name.substring(3));
+                    this.namespace.putValue(property, args[0]);
+                }
+            }
+            return null;
+        }
+        if(returnType == Class.class) {
+            if("getClass".equals(name)) {
+                // pretend to be this
+                return this.type;
+            }
+        }
+        if("toString".equals(name)) {
+            // try to output nicely
+            return BeansW.beanToString(proxy);
+        }
+        if(name.startsWith("get")) {
+            String property = StringUtils.uncapitalise(name.substring(3));
+            return this.namespace.getValue(property);
+        }
+        return null; // ??
+    }
+
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/BeanViewRuntime.java b/genjava/gj-beans/src/java/com/generationjava/beans/BeanViewRuntime.java
new file mode 100644
index 00000000..82eda0ab
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/BeanViewRuntime.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.beans;
+
+import java.util.LinkedList;
+import java.util.Iterator;
+
+public class BeanViewRuntime {
+
+    private LinkedList list;
+
+    public BeanViewRuntime() {
+        list = new LinkedList();
+    }
+
+    public Iterator iterateUpwards() {
+        return list.iterator();
+    }
+
+    public void pushObject(Object obj) {
+        list.addFirst(obj);
+    }
+
+    public Object parentObject() {
+        return list.getFirst();
+    }
+
+    public Object parentObject(int n) {
+        return list.get(n);
+    }
+
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/BeansW.java b/genjava/gj-beans/src/java/com/generationjava/beans/BeansW.java
new file mode 100644
index 00000000..a3ed1ebc
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/BeansW.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.beans;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+
+import com.generationjava.lang.ClassW;
+import org.apache.commons.lang.NumberUtils;
+
+public class BeansW {
+
+    static private java.text.DateFormat format = new java.text.SimpleDateFormat();
+
+    static public Object convert(Object value, Class toClass) {
+        System.err.println("ASKED TO CONVERT: "+value+" which is a "+value.getClass()+" to "+toClass);
+        if(toClass.equals(value.getClass())) {
+            return value;
+        } else
+        if(ClassW.classInstanceOf(toClass, "java.lang.String")) {
+            return value;
+        } else 
+        if(ClassW.classInstanceOf(toClass, "java.lang.Integer") ||
+           Integer.TYPE.equals(toClass)
+          ) {
+            return NumberUtils.createInteger(value.toString());
+        } else 
+        if(ClassW.classInstanceOf(toClass, "java.lang.Long") ||
+           Long.TYPE.equals(toClass)
+          ) {
+            return NumberUtils.createLong(value.toString());
+        } else 
+        if(ClassW.classInstanceOf(toClass, "java.lang.Double") ||
+           Double.TYPE.equals(toClass)
+          ) {
+            return NumberUtils.createDouble(value.toString());
+        } else 
+        if(ClassW.classInstanceOf(toClass, "java.lang.Number")) {
+            return NumberUtils.createNumber(value.toString());
+        } else 
+        if(ClassW.classInstanceOf(toClass, "java.util.Date")) {
+//            return DateW.parseString(value.toString());
+            try {
+                return format.parse( value.toString() );
+            } catch(java.text.ParseException pe) {
+                return value;
+            }
+        } else {
+            return value;
+        }
+    }
+
+    static public String beanToString(Object bean) {
+        if(bean == null) {
+            return null;
+        }
+        Class clss = bean.getClass();
+        StringBuffer text = new StringBuffer();
+        try {
+            BeanInfo beaninfo = Introspector.getBeanInfo(clss);
+            PropertyDescriptor[] pd = beaninfo.getPropertyDescriptors();
+            for(int i=0; i<pd.length; i++) {
+                if(pd[i] == null) {
+                    continue;
+                }
+                Method method = pd[i].getReadMethod();
+                Class arg = method.getReturnType();
+                if("class".equals(pd[i].getName())) {
+                    if(arg == Class.class) {
+                        continue;
+                    }
+                }
+                Object val = method.invoke(bean,new Object[0]);
+                text.append(pd[i].getName());
+                text.append(": ");
+                text.append(""+val);
+                text.append("\n");
+            }
+        } catch(IntrospectionException ie) {
+            ie.printStackTrace();
+        } catch(IllegalArgumentException iae) {
+            iae.printStackTrace();
+        } catch(IllegalAccessException iae) {
+            iae.printStackTrace();
+        } catch(InvocationTargetException ite) {
+            ite.printStackTrace();
+        }
+
+        return text.toString();
+    }
+
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/DelegatableBeanViewer.java b/genjava/gj-beans/src/java/com/generationjava/beans/DelegatableBeanViewer.java
new file mode 100644
index 00000000..2612df33
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/DelegatableBeanViewer.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.beans;
+
+import org.apache.commons.collections.CollectionUtils;
+
+/**
+ * Uses a GetDelegate to get a property from an object.
+ */
+public class DelegatableBeanViewer extends AbstractBeanViewer {
+
+    private GetDelegate gd;
+
+    public DelegatableBeanViewer(GetDelegate gd) {
+        this.gd = gd;
+    }
+
+    public Object invokeGet(BeanViewRuntime runtime, Object obj, String name, Object idx) {
+        Object obj2 = gd.get(obj, name);
+        obj2 = CollectionUtils.index(obj2, idx);
+        return obj2;
+    }
+
+    public void invokeSet(BeanViewRuntime runtime, Object bean, String name, Object idx, Object value) {
+    }
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/GetDelegate.java b/genjava/gj-beans/src/java/com/generationjava/beans/GetDelegate.java
new file mode 100644
index 00000000..e39e92bb
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/GetDelegate.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.beans;
+
+/**
+ * Something which can return an Object that has a certain name in 
+ * an object.
+ */
+public interface GetDelegate {
+
+    /**
+     * Get the property named from the Object.
+     */
+    public Object get(Object obj, String name);
+
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/ReflectionBeanViewer.java b/genjava/gj-beans/src/java/com/generationjava/beans/ReflectionBeanViewer.java
new file mode 100644
index 00000000..15f970f8
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/ReflectionBeanViewer.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.beans;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Uses Reflection to get a named property from an object.
+ */
+public class ReflectionBeanViewer extends AbstractBeanViewer {
+
+    public ReflectionBeanViewer() {
+    }
+
+    /**
+     * Get an indexed property from a java bean. If the property is 
+     * not indexed then a -1 is passed in.
+     *
+     * If it's not possible to get the object, then null is returned.
+     */
+    public Object invokeGet(BeanViewRuntime runtime, Object bean, String methodName, Object index) {
+        int idx = -1;
+        boolean arrayLike = (index instanceof Integer);
+        if(arrayLike) {
+            idx = ((Integer)index).intValue();
+        }
+        methodName = "get"+StringUtils.capitalise(methodName);
+
+        Method getMethod = null;
+        Class[] clss0 = new Class[0];
+        Class[] clss = null;
+        try {
+            if(arrayLike) {
+                clss = new Class[1];
+                clss[0] = Integer.TYPE;
+            } else {
+                clss = clss0;
+            }
+            getMethod = bean.getClass().getMethod(methodName, clss);
+        } catch(SecurityException se) {
+        } catch(NoSuchMethodException nsme) {
+            try {
+                if(clss != clss0) {
+                    getMethod = bean.getClass().getMethod(methodName, clss0);
+                }
+                arrayLike = false;
+            } catch(SecurityException se2) {
+            } catch(NoSuchMethodException nsme2) {
+            }
+        }
+
+        if(getMethod == null) {
+            return null;
+        }
+        try {
+            Object[] param = null;
+            if(arrayLike) {
+                param = new Object[1];
+                param[0] = (Integer)index;
+            } else {
+                param = new Object[0];
+            }
+            Object obj = getMethod.invoke( bean, param );
+            obj = CollectionUtils.index(obj, index);
+
+            return obj;
+        } catch(IllegalAccessException iae) {
+            iae.printStackTrace();
+            return null;
+        } catch(IllegalArgumentException iae) {
+            iae.printStackTrace();
+            return null;
+        } catch(InvocationTargetException ite) {
+            ite.printStackTrace();
+            return null;
+        }
+
+    }
+
+    public void invokeSet(BeanViewRuntime runtime, Object bean, String methodName, Object idx, Object value) {
+//        int idx = -1;
+//        boolean arrayLike = (index instanceof Integer);
+//        if(arrayLike) {
+//            idx = ((Integer)index).intValue();
+//        }
+        methodName = "set"+StringUtils.capitalise(methodName);
+
+        Method setMethod = null;
+        Method[] methods = bean.getClass().getMethods();
+        int size = methods.length;
+        for(int i=0; i<size; i++) {
+            if(methods[i].getName().equals(methodName)) {
+                setMethod = methods[i];
+                break;
+            }
+        }
+
+        /* OLD GET
+        Class[] clss0 = new Class[0];
+        Class[] clss = null;
+        try {
+            if(arrayLike) {
+                clss = new Class[1];
+                clss[0] = Integer.TYPE;
+            } else {
+                clss = clss0;
+            }
+            getMethod = bean.getClass().getMethod(methodName, clss);
+        } catch(SecurityException se) {
+        } catch(NoSuchMethodException nsme) {
+            try {
+                if(clss != clss0) {
+                    getMethod = bean.getClass().getMethod(methodName, clss0);
+                }
+                arrayLike = false;
+            } catch(SecurityException se2) {
+            } catch(NoSuchMethodException nsme2) {
+            }
+        }
+        */
+
+        if(setMethod == null) {
+            return;
+        }
+
+        System.err.println("CONVERT-TO"+setMethod.getParameterTypes()[0]);
+        System.err.println("CONVERT:"+value);
+        value = BeansW.convert(value, setMethod.getParameterTypes()[0]);
+        
+        try {
+            Object[] param = null;
+//            if(arrayLike) {
+//                param = new Object[1];
+//                param[0] = (Integer)index;
+//            } else {
+                param = new Object[1];
+                param[0] = value;
+//            }
+            setMethod.invoke( bean, param );
+//            obj = CollectionUtils.index(obj, index);
+
+            return;
+        } catch(IllegalAccessException iae) {
+            iae.printStackTrace();
+            return;
+        } catch(IllegalArgumentException iae) {
+            iae.printStackTrace();
+            return;
+        } catch(InvocationTargetException ite) {
+            ite.printStackTrace();
+            return;
+        }
+
+    }
+
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/beans/package.html b/genjava/gj-beans/src/java/com/generationjava/beans/package.html
new file mode 100644
index 00000000..34b2a72a
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/beans/package.html
@@ -0,0 +1,10 @@
+<html>
+<body>
+  <p>
+Provides reflective ability on JavaBeans. BeanComparator in com.generationjava.compare uses this and is very nice. com.generationjava.collections.BeanMap is also nice.
+  </p>
+  <p>
+Jakarta Commons BeanUtils is pretty much the same as all this. This is cuter I think, but less mature.
+  </p>
+</body>
+</html> 
diff --git a/genjava/gj-beans/src/java/com/generationjava/collections/BeanMap.java b/genjava/gj-beans/src/java/com/generationjava/collections/BeanMap.java
new file mode 100644
index 00000000..44fa5797
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/collections/BeanMap.java
@@ -0,0 +1,404 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.collections;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.Set;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+
+import com.generationjava.beans.AbstractBeanViewer;
+import com.generationjava.beans.BeanViewRuntime;
+
+/**
+ * A Map which wraps a JavaBean.
+ *
+ * @date 2001-05-11
+ */
+public class BeanMap extends AbstractBeanViewer implements Map {
+
+    private Object myBean = null;
+    private Map pdCache = new HashMap();
+
+    /**
+     * Construct a BeanMap around the supplied Java Bean.
+     */
+    public BeanMap(Object bean) {
+        myBean = bean;
+        try {
+            BeanInfo info = Introspector.getBeanInfo( myBean.getClass() );
+            PropertyDescriptor[] pds = info.getPropertyDescriptors();
+            for(int i=0; i<pds.length; i++) {
+                pdCache.put( pds[i].getName(), pds );
+            }
+        } catch(IntrospectionException ie) {
+        }
+    }
+
+    /**
+     * Get the PropertyDescriptor for a particular property name.
+     */
+    public PropertyDescriptor getPropertyDescriptor(Object key) {
+        return (PropertyDescriptor)pdCache.get( key.toString() );
+    }
+
+    /* map interface */
+
+    // Removes all mappings from this map (optional operation) {. 
+    public void clear() {
+    }
+
+    // Returns true if this map contains a mapping for the specified key. 
+    public boolean containsKey(Object key) { 
+        return pdCache.containsKey(key);
+    }
+
+    // Returns true if this map maps one or more keys to the specified value. 
+    // TODO: Implement this
+    public boolean containsValue(Object value) { 
+        return false;
+    }
+
+    // Returns a set view of the mappings contained in this map. 
+    // TODO: Implement this    
+    public Set entrySet() { 
+        return null;
+    }
+
+    // Compares the specified object with this map for equality. 
+    public boolean equals(Object o) {
+        return myBean.equals(o);
+    }
+
+    // Returns the value to which this map maps the specified key. 
+/*
+    public Object get(Object key) { 
+        PropertyDescriptor desc = getPropertyDescriptor(key);
+        Method get = desc.getReadMethod();
+        if(get == null) {
+            return null;
+        }
+        Object[] objs = new Object[0];
+        try {
+            return get.invoke( myBean, objs );
+        
+        } catch(IllegalAccessException iae) {
+            return null;
+        } catch(IllegalArgumentException iae) {
+            return null;
+        } catch(InvocationTargetException ite) {
+            return null;
+        }
+    }
+*/
+
+    // Returns the hash code value for this map. 
+    public int hashCode() { 
+        return myBean.hashCode();
+    }
+
+    // Returns true if this map contains no key-value mappings. 
+    // QUERY: Is a map empty if it contains blah:null pairings?
+    public boolean isEmpty() {
+        return pdCache.isEmpty();
+    }
+
+    // Returns a set view of the keys contained in this map. 
+    public Set keySet() { 
+        return pdCache.keySet();
+    }
+
+    // Associates the specified value with the specified key in this map (optional operation) {. 
+    // TODO: Implement this
+    /**
+     * Unimplemented.
+     */
+    public Object put(Object key, Object value) { 
+        Object oldValue = get(key);
+        PropertyDescriptor desc = getPropertyDescriptor(key);
+        Method set = desc.getWriteMethod();
+        if(set == null) {
+            return oldValue;  // ??
+        }
+        Object[] objs = new Object[1];
+        objs[0] = value;
+        try {
+            return set.invoke( myBean, objs );        
+        } catch(IllegalAccessException iae) {
+            return oldValue;
+        } catch(IllegalArgumentException iae) {
+            return oldValue;
+        } catch(InvocationTargetException ite) {
+            return oldValue;
+        }
+    }
+
+    // Copies all of the mappings from the specified map to this map (optional operation) {. 
+    public void putAll(Map t) { 
+        Iterator keys = t.keySet().iterator();
+        while(keys.hasNext()) {
+            Object key = keys.next();
+            put(key, t.get(key));
+        }
+    }
+
+    // Removes the mapping for this key from this map if present (optional operation) {. 
+    // TODO: Implement this
+    /**
+     * Unimplemented.
+     */
+    public Object remove(Object key) { 
+        return null;
+    }
+
+    // Returns the number of key-value mappings in this map. 
+    public int size() { 
+        return pdCache.size();
+    }
+
+    // Returns a collection view of the values contained in this map. 
+    public Collection values() { 
+        Set set = keySet();
+        LinkedList values = new LinkedList();
+        Iterator iterator = set.iterator();
+        while(iterator.hasNext()) {
+            values.add( get( iterator.next() ) );
+        }
+        return values;
+    }
+
+    public Object get(Object key) {
+        return get(key, this.myBean);
+/*        if( key == null ) {
+            return null;
+        }
+
+        if(myBean == null) {
+            return null;
+        }
+
+        String name = key.toString();
+
+        int idx = 0;
+        Object obj = myBean;
+        while( (idx = name.indexOf('.', idx)) != -1) {
+            String pre = name.substring(0, idx);
+            name = name.substring(idx+1);
+            if(obj != null) {
+                obj = handleGet(obj, pre);
+            } else {
+                return null;
+            }
+        }
+
+        return handleGet(obj, name);
+        */
+    }
+/*
+    public Object handleGet(Object bean, String name) {
+
+        // deal with array
+        Object index = null;
+        int i = name.indexOf('[');
+        String pre = null;
+//        boolean arrayLike = false;
+        if(i != -1) {
+            pre = name.substring(i+1);
+            if(pre.endsWith("]")) {
+                pre = pre.substring(0, pre.length() -1);
+            }
+            try {
+                index = Integer.valueOf(pre);
+//                arrayLike = true;
+            } catch(NumberFormatException nfe) {
+                index = pre;
+            }
+            name = name.substring(0,i);
+        }
+
+        // capitalise
+        name = name.substring(0,1).toUpperCase();
+        if(name.length() > 1) {
+            name += name.substring(1);
+        }
+
+/*
+        methodName = "get"+methodName;
+
+        Method getMethod = null;
+        Class[] clss0 = new Class[0];
+        Class[] clss = null;
+        try {
+            if(idx != -1) {
+                clss = new Class[1];
+                clss[0] = Integer.TYPE;
+            } else {
+                clss = clss0;
+            }
+            getMethod = bean.getClass().getMethod(methodName, clss);
+        } catch(SecurityException se) {
+        } catch(NoSuchMethodException nsme) {
+            try {
+                if(clss != clss0) {
+                    getMethod = bean.getClass().getMethod(methodName, clss0);
+                }
+                arrayLike = false;
+            } catch(SecurityException se2) {
+            } catch(NoSuchMethodException nsme2) {
+            }
+        }
+
+        if(getMethod == null) {
+            return null;
+        }
+        try {
+            Object[] param = null;
+            if(arrayLike) {
+                param = new Object[1];
+                param[0] = new Integer(idx);
+            } else {
+                param = new Object[0];
+            }
+            Object obj = getMethod.invoke( bean, param );
+*       /
+            Object obj = invokeGet( bean, name, index );
+            obj = CollectionUtils.index(obj, index);
+            return obj;
+            /*
+            if( (obj instanceof Map) && (pre != null) ) {
+                return ((Map)obj).get(pre);
+            } else
+            if( (obj instanceof List) && (idx != -1) ) {
+                return ((List)obj).get(idx);
+            } else
+            if( (obj instanceof Object[]) && (idx != -1) ) {
+                return ((Object[])obj)[idx];
+            } else {
+                return obj;
+            }
+            */
+/*
+        } catch(IllegalAccessException iae) {
+            return null;
+        } catch(IllegalArgumentException iae) {
+            return null;
+        } catch(InvocationTargetException ite) {
+            return null;
+        }
+*        /
+    }
+*/
+    /**
+     * Returns bean.get<methodName>[idx]
+     */
+    public Object invokeGet(BeanViewRuntime runtime, Object bean, String methodName, Object index) {
+        int idx = -1;
+        boolean arrayLike = (index instanceof Integer);
+        if(arrayLike) {
+            idx = ((Integer)index).intValue();
+        }
+        methodName = "get"+methodName;
+
+        Method getMethod = null;
+        Class[] clss0 = new Class[0];
+        Class[] clss = null;
+        try {
+            if(arrayLike) {
+                clss = new Class[1];
+                clss[0] = Integer.TYPE;
+            } else {
+                clss = clss0;
+            }
+            getMethod = bean.getClass().getMethod(methodName, clss);
+        } catch(SecurityException se) {
+        } catch(NoSuchMethodException nsme) {
+            try {
+                if(clss != clss0) {
+                    getMethod = bean.getClass().getMethod(methodName, clss0);
+                }
+                arrayLike = false;
+            } catch(SecurityException se2) {
+            } catch(NoSuchMethodException nsme2) {
+            }
+        }
+
+        if(getMethod == null) {
+            return null;
+        }
+        try {
+            Object[] param = null;
+            if(arrayLike) {
+                param = new Object[1];
+                param[0] = new Integer(idx);
+            } else {
+                param = new Object[0];
+            }
+            Object obj = getMethod.invoke( bean, param );
+            obj = CollectionUtils.index(obj, idx);
+
+            return obj;
+//            if( (obj instanceof Map) && (pre != null) ) {
+//                return ((Map)obj).get(pre);
+//            } else
+//            if( (obj instanceof List) && (idx != -1) ) {
+//                return ((List)obj).get(idx);
+//            } else
+//            if( (obj instanceof Object[]) && (idx != -1) ) {
+//                return ((Object[])obj)[idx];
+//            } else {
+//                return obj;
+//            }
+        } catch(IllegalAccessException iae) {
+            return null;
+        } catch(IllegalArgumentException iae) {
+            return null;
+        } catch(InvocationTargetException ite) {
+            return null;
+        }
+    }
+
+    public void invokeSet(BeanViewRuntime runtime, Object bean, String name, Object idx, Object value) {
+    }
+}
diff --git a/genjava/gj-beans/src/java/com/generationjava/compare/BeanComparator.java b/genjava/gj-beans/src/java/com/generationjava/compare/BeanComparator.java
new file mode 100644
index 00000000..fd7bc629
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/compare/BeanComparator.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.compare;
+
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Iterator;
+
+import com.generationjava.beans.ReflectionBeanViewer;
+
+/**
+ * A Comparator for JavaBeans. Provide the name of the property to 
+ * be compared with, and BeanComparator will deal with finding the 
+ * property and comparing on it using ObjectComparator.
+ * 
+ * Some examples are: 
+ * "person" -> getPerson()
+ * "person.name" -> getPerson().getName()
+ * "person.addressMap.fred" -> getPerson().getAddressMap().get("fred")
+ * "person.phone[3]" -> getPerson().getPhone()[3] and 
+ *                      getPerson().getPhone().get(3) (array and List)
+ */
+public class BeanComparator implements Comparator {
+
+    static private Map beanComparatorRegistry = new HashMap();
+
+    /**
+     * Get a BeanComparator for the specified property.
+     */
+    static public BeanComparator getInstance(String attrib) {
+        Object obj = beanComparatorRegistry.get(attrib);
+        if(obj == null) {
+            obj = new BeanComparator(attrib);
+            beanComparatorRegistry.put(attrib, obj);
+        }
+        return (BeanComparator)obj;
+    }
+
+    private String attribute;
+    private HashMap cache;
+    private ReflectionBeanViewer bv = new ReflectionBeanViewer();
+    private Comparator oc = new ObjectComparator();
+
+    public BeanComparator(String attrib) {
+        this.attribute = attrib;
+    }
+
+    public void setComparator(Comparator comp) {
+        this.oc = comp;
+    }
+
+    /**
+     * Do a Schwartzian transform precompile of all the values.
+     * Pattern from Perl.
+     */
+    public void precompile(Collection col) {
+        caching(true);
+        Iterator iterator = col.iterator();
+        while(iterator.hasNext()) {
+            Object bean = iterator.next();
+            Object ret = bv.get(this.attribute, bean);
+            cache.put(bean, ret);
+        }
+    }
+
+    /**
+     * Turn on caching. Akin to Perl's Orcish maneuver.
+     * Recalling this method will reset caching.
+     */
+    public boolean caching(boolean b) {
+        boolean b2 = caching();
+        this.cache = b?new HashMap():null;
+        return b2;
+    }
+
+    /**
+     * Is caching on?
+     */
+    public boolean caching() {
+        return (this.cache != null);
+    }
+
+    public int compare(Object o1, Object o2) {
+        if(o1 == null) {
+            return 1;
+        } else
+        if(o2 == null) {
+            return -1;
+        }
+        
+        Object ret1 = null;
+        Object ret2 = null;
+        if(caching()) {
+            ret1 = cache.get(o1);
+            ret2 = cache.get(o2);
+        }
+        if(ret1 == null) {
+            ret1 = bv.get(this.attribute, o1);
+        }
+        if(ret2 == null) {
+            ret2 = bv.get(this.attribute, o2);
+        }
+
+        return oc.compare(ret1, ret2);
+    }
+}
+
diff --git a/genjava/gj-beans/src/java/com/generationjava/namespace/BeanNamespace.java b/genjava/gj-beans/src/java/com/generationjava/namespace/BeanNamespace.java
new file mode 100644
index 00000000..e0b2eace
--- /dev/null
+++ b/genjava/gj-beans/src/java/com/generationjava/namespace/BeanNamespace.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.namespace;
+
+import java.util.Iterator;
+
+import com.generationjava.beans.ReflectionBeanViewer;
+
+/**
+ * A Bean namespace. It gets its value from a java-bean.
+ */
+public class BeanNamespace extends AbstractNamespace {
+
+    private ReflectionBeanViewer myViewer;
+    private Object myBean;
+
+    public BeanNamespace(Object bean) {
+        this.myViewer = new ReflectionBeanViewer();
+        this.myBean = bean;
+    }
+
+    public Object getBean() {
+        return this.myBean;
+    }
+
+    /**
+     * Get a property from a bean. Dotted notation, array notation 
+     * and associative array notation all apply.
+     */
+    public Object getValue(String name) {
+        return myViewer.get(name,myBean);
+    }
+
+    /**
+     * Unimplemented.
+     */
+    public void putValue(String name, Object info) {
+        // bean-namespace's are read only for the moment.
+    }
+
+    public Iterator iterateNames() {
+        // return the names
+        return null;
+    }
+
+}
diff --git a/genjava/gj-csv/LICENSE.txt b/genjava/gj-csv/LICENSE.txt
new file mode 100644
index 00000000..38aecf65
--- /dev/null
+++ b/genjava/gj-csv/LICENSE.txt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
diff --git a/genjava/gj-csv/project.properties b/genjava/gj-csv/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-csv/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-csv/project.xml b/genjava/gj-csv/project.xml
new file mode 100755
index 00000000..cda9215b
--- /dev/null
+++ b/genjava/gj-csv/project.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-csv</id>
+  <name>GenJava-CSV</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    CSV component of GenJava-Core. Reads and writes CSV files.
+  </description>
+  
+  <shortDescription>CSV Reader/Writers</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.7</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-csv/src/java/com/generationjava/io/Csv.java b/genjava/gj-csv/src/java/com/generationjava/io/Csv.java
new file mode 100644
index 00000000..f63f7367
--- /dev/null
+++ b/genjava/gj-csv/src/java/com/generationjava/io/Csv.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
+// Csv.java
+package com.generationjava.io;
+
+import java.io.IOException;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Properties;
+import java.util.Set;
+
+public class Csv {
+
+    static public char FIELD_DELIMITER = ',';
+    static public char BLOCK_DELIMITER = '\n';
+
+    private LinkedList list = new LinkedList();
+    private String[] headers;
+
+    public Csv(CsvReader reader) throws IOException {
+        this.headers = reader.readLine();
+
+        String[] line = null;
+
+        // suck in the file.
+        // TODO: What's the optimal structure for this
+        while( (line = reader.readLine()) != null) {
+            list.add(line);
+        }
+    }
+
+    // get all of the unique fields for this header
+    public String[] getAll(String header) {
+        HashSet values = new HashSet();
+        int idx = getHeaderIndex(header);
+        Iterator iterator = list.iterator();
+        while(iterator.hasNext()) {
+            values.add( ((String[])iterator.next())[idx]);
+        }
+        return (String[])values.toArray(new String[0]);
+    }
+
+    private int getHeaderIndex(String header) {
+        for(int i=0;i<this.headers.length;i++) {
+            if(header.equals(this.headers[i])) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public String[] get(String header, String subheader, String value) {
+        HashSet values = new HashSet();
+        int idx = getHeaderIndex(header);
+        int subidx = getHeaderIndex(subheader);
+        Iterator iterator = list.iterator();
+        while(iterator.hasNext()) {
+            String[] strs = (String[])iterator.next();
+            if(value.equals(strs[idx])) {
+                values.add( strs[subidx] );
+            }
+        }
+        return (String[])values.toArray(new String[0]);
+    }
+
+    public String[] get(String header, Properties context) {
+        // optimisation
+        if(context.contains(header)) {
+            String[] ret = new String[1];
+            ret[1] = context.getProperty(header);
+            return ret;
+        }
+
+        HashSet values = new HashSet();
+        int idx = getHeaderIndex(header);
+        Iterator iterator = list.iterator();
+        Set keys = context.keySet();
+LABEL:  while(iterator.hasNext()) {
+            // get next csv row
+            String[] strs = (String[])iterator.next();
+
+            // check that this row is in context
+            Iterator keysIterator = keys.iterator();
+            while(keysIterator.hasNext()) {
+                String key = (String)keysIterator.next();
+                String value = context.getProperty(key);
+                int hdrIndex = getHeaderIndex(key);
+                if(!value.equals(strs[hdrIndex])) {
+                    continue LABEL;
+                }
+            }
+
+            values.add(strs[idx]);
+        }
+
+        return (String[])values.toArray(new String[0]);
+    }
+
+}
diff --git a/genjava/gj-csv/src/java/com/generationjava/io/CsvFieldReader.java b/genjava/gj-csv/src/java/com/generationjava/io/CsvFieldReader.java
new file mode 100644
index 00000000..1f5b16e6
--- /dev/null
+++ b/genjava/gj-csv/src/java/com/generationjava/io/CsvFieldReader.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
+// CsvFieldReader.java
+package com.generationjava.io;
+
+import java.io.IOException;
+import java.io.Reader;
+
+public class CsvFieldReader extends CsvReader {
+
+    private String[] headers;
+    private String[] currentLine;
+
+    public CsvFieldReader(Reader reader) {
+        super(reader);
+    }
+
+    public void loadHeaders() throws IOException {
+        if(this.headers == null) {
+            useHeaders(super.readLine());
+        }
+    }
+
+    public void useHeaders(String[] headers) {
+        this.headers = headers;
+    }
+
+    public String readField(String name) throws IOException {
+        if(this.headers == null) {
+            loadHeaders();
+        }
+
+        if(this.currentLine == null) {
+            nextBlock();
+            if(this.currentLine == null) {
+                return null;
+            }
+        }
+
+        int idx = -1;
+        for(int i=0;i<this.headers.length;i++) {
+            if(name.equals(this.headers[i])) {
+                idx = i;
+            }
+        }
+
+        String field = null;
+
+        if(idx != -1) {
+            field = currentLine[idx];
+        }
+
+        return field;
+    }
+
+    public boolean nextBlock() throws IOException {
+        this.currentLine = super.readLine();
+        return (this.currentLine != null);
+    }
+
+}
diff --git a/genjava/gj-csv/src/java/com/generationjava/io/CsvReader.java b/genjava/gj-csv/src/java/com/generationjava/io/CsvReader.java
new file mode 100644
index 00000000..8aeab4b1
--- /dev/null
+++ b/genjava/gj-csv/src/java/com/generationjava/io/CsvReader.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.io;
+
+import java.io.Reader;
+import java.io.IOException;
+
+import java.util.ArrayList;
+
+// TODO: Add consuming so that log files may be read.
+//       these are flies in which the delimiter is any number of 
+//       a certain character. ie) space, tab etc.
+
+// alternative: Allow delimiter to be larger than one char.
+// still doesnt really help though. Could use Regexps?
+
+// maybe a second class. RegexpBlockReader....
+
+public class CsvReader {
+
+    // new String to stop internning
+    static public String END_OF_LINE = new String("END_OF_LINE");
+
+    private char field_delim = Csv.FIELD_DELIMITER;
+    private char block_delim = Csv.BLOCK_DELIMITER;
+
+    private Reader reader;
+    private boolean newline;
+
+    // should   bbb,,,ccc be considered to be two elements?
+    // useful for log parsing.
+    private boolean consume;
+
+    public CsvReader(Reader rdr) {
+        this.reader = rdr;
+    }
+
+    public void setFieldDelimiter(char ch) {
+        field_delim = ch;
+    }
+
+    public void setBlockDelimiter(char ch) {
+        block_delim = ch;
+    }
+
+    public void setConsuming(boolean b) {
+        this.consume = b;
+    }
+
+    public boolean isConsuming() {
+        return this.consume;
+    }
+
+    public String[] readLine() throws IOException {
+        ArrayList list = new ArrayList();
+        String str;
+
+        while( true ) {
+            str = readField();
+            if(str == null) {
+                break;
+            }
+            if(str == END_OF_LINE) {
+                break;
+            }
+            list.add(str);
+        }
+
+        if(list.isEmpty()) {
+            return null;
+        }
+
+        return (String[])list.toArray(new String[0]);
+    }
+
+    public String readField() throws IOException {
+        if(this.newline) {
+            this.newline = false;
+            return END_OF_LINE;
+        }
+
+        StringBuffer buffer = new StringBuffer();
+        boolean quoted = false;
+        int last = -1;
+        int ch = this.reader.read();
+
+        if(ch == -1) {
+            return null;
+        }
+
+        if(ch == '"') {
+            quoted = true;
+        } else 
+        if(ch == block_delim) {
+            return END_OF_LINE;
+        } else
+        if(ch == field_delim) {
+            return "";
+        } else {
+            buffer.append((char)ch);
+        }
+
+        while( (ch = this.reader.read()) != -1) {
+            if(ch == block_delim) {
+                this.newline = true;
+                break;
+            }
+            if(quoted) {
+                if(ch == '"') {
+                    if(last == '"') {
+                        // forget about this quote and move on
+                        last = -1;  
+                        buffer.append('"');
+                        continue;
+                    }
+                    last = '"';
+                    continue;
+                }
+            }
+            if(ch == field_delim) {
+                if(quoted) {
+                    if(last == '"') {
+                        break;
+                    }
+                } else {
+                    break;
+                }
+            }
+            buffer.append((char)ch);
+        }
+
+        return buffer.toString();
+    }
+
+    public void close() throws IOException {
+        this.reader.close();
+    }
+
+}
diff --git a/genjava/gj-csv/src/java/com/generationjava/io/CsvWriter.java b/genjava/gj-csv/src/java/com/generationjava/io/CsvWriter.java
new file mode 100644
index 00000000..4f35ef42
--- /dev/null
+++ b/genjava/gj-csv/src/java/com/generationjava/io/CsvWriter.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.io;
+
+import java.io.IOException;
+import java.io.Writer;
+
+//import org.apache.commons.lang.StringUtils;
+
+public class CsvWriter {
+
+    private char field_delim = Csv.FIELD_DELIMITER;
+    private char block_delim = Csv.BLOCK_DELIMITER;
+
+    private Writer writer;
+    private boolean written;
+
+    public CsvWriter(Writer wtr) {
+        this.writer = wtr;
+    }
+
+    public Writer getWriter() {
+        return this.writer;
+    }
+
+    public void setFieldDelimiter(char ch) {
+        field_delim = ch;
+    }
+
+    public void setBlockDelimiter(char ch) {
+        block_delim = ch;
+    }
+
+    public void writeField(String field) throws IOException {
+        if(written) {
+            writer.write(field_delim);
+            written = false;
+        }
+
+        int idx = field.indexOf(field_delim);
+        if(idx != -1) {
+            field = "\""+replace(field,"\"","\"\"")+"\"";
+        }
+
+        writer.write(field);
+        written = true;
+    }
+
+    public void endBlock() throws IOException {
+        writer.write(block_delim);
+        written = false;
+    }
+
+    public void writeLine(String[] strs) throws IOException {
+        int sz = strs.length;
+        for(int i=0;i<sz;i++) {
+            writeField(strs[i]);
+        }
+        endBlock();
+    }
+
+    public void close() throws IOException {
+        this.writer.close();
+    }
+
+    // from Commons.Lang.StringUtils
+    private static String replace(String text, String repl, String with) {   
+        int max = -1;
+        if (text == null || repl == null || with == null || repl.length() == 0 || max == 0) {
+            return text;
+        }
+        
+        StringBuffer buf = new StringBuffer(text.length());
+        int start = 0, end = 0;
+        while ((end = text.indexOf(repl, start)) != -1) {
+            buf.append(text.substring(start, end)).append(with);
+            start = end + repl.length();
+            
+            if (--max == 0) {
+                break;
+            }
+        }
+        buf.append(text.substring(start));
+        return buf.toString();
+    }
+
+}
diff --git a/genjava/gj-mail/project.properties b/genjava/gj-mail/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-mail/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-mail/project.xml b/genjava/gj-mail/project.xml
new file mode 100755
index 00000000..1e6b0049
--- /dev/null
+++ b/genjava/gj-mail/project.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-mail</id>
+  <name>GenJava-Mail</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    Mail component of GenJava-Core. Adds some helper functionality around JavaMail.
+  </description>
+  
+  <shortDescription>Mail helpers</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>javamail</id>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <id>gj-core</id>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+    <dependency>
+      <id>junit</id>
+      <version>3.7</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-mail/src/java/com/generationjava/mail/MBoxMimeMessage.java b/genjava/gj-mail/src/java/com/generationjava/mail/MBoxMimeMessage.java
new file mode 100644
index 00000000..2a5398dc
--- /dev/null
+++ b/genjava/gj-mail/src/java/com/generationjava/mail/MBoxMimeMessage.java
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.mail;
+
+import java.io.InputStream;
+
+import javax.mail.*;
+import javax.mail.internet.*;
+
+import com.generationjava.collections.CollectionsW;
+import com.generationjava.io.StreamW;
+import org.apache.commons.lang.StringUtils;
+
+// one other idea is to allow a body only to be passed in, 
+// with the headers already set within that.
+
+// TODO:
+//    Attachment: 1. <filename> <comment>,
+//                2. .....
+public class MBoxMimeMessage extends MimeMessage {
+
+    private static java.text.DateFormat format = new java.text.SimpleDateFormat();
+
+    public MBoxMimeMessage(Session session) {
+        super(session);
+    }
+
+    public void setText(String body) throws MessagingException {
+        parseMBox(this, body);
+    }
+
+    public void parseMBox(Part mimePart, String body) throws MessagingException {
+//        System.err.println("BODY["+body+"]");
+// Date: 26 Feb 2001 00:11:05 +0000
+// From: <email>
+// To: <email>
+// Subject: <subject>
+// Content-Type: TEXT/PLAIN; charset=US-ASCII
+// then a blank line. How to handle multi??
+
+// multi is handled by:
+// Content-Type: multipart/alternative; boundary="FLAG"
+// --FLAG
+// Content-Type: text/plain; charset="iso-8859-1"
+// ....texxt...
+// Content-Type: text/html; charset="iso-8859-1"
+// Content-Transfer-Encoding: quoted-printable
+
+        // split lines
+        String[] lines = StringUtils.split(body, "\n");
+
+        // pre process lines so that any headers that are split 
+        // over a newline are joined
+
+        int sz = lines.length;
+        String multipart = null;
+        String mimeType = null;
+        String subtype = null;
+        int i=0;  // kept for later
+        for(; i<sz; i++) {
+            if("".equals(lines[i].trim())) {
+                break;
+            }
+
+            int colonIdx = lines[i].indexOf(":");
+            if(colonIdx == -1) {
+                if(!lines[i].trim().startsWith("From ")) {
+                    if(!lines[i].equals("")) {
+                        i--;
+                    }
+                    break;
+                }
+            } else {
+                String hdr   = lines[i].substring(0, colonIdx).trim();
+                String value = lines[i].substring(colonIdx+1).trim();
+
+                if(mimePart instanceof MimeMessage) {
+                    MimeMessage msg = (MimeMessage)mimePart;
+                    if("Date".equals(hdr)) {
+                        // TODO: Check if this is meant to be a standard of some kind
+//                        msg.setSentDate( DateW.parseString(value) );
+                        try {
+                            msg.setSentDate( format.parse(value) );
+                        } catch(java.text.ParseException pe) {
+                            throw new MessagingException("Unable to parse Date: "+value);
+                        }
+                        continue;
+                    } else
+                    if("From".equals(hdr)) {
+                        msg.setFrom( InternetAddress.parse(value)[0] );
+                        continue;
+                    } else
+                    if("ReplyTo".equals(hdr)) {
+                        msg.setReplyTo( InternetAddress.parse(value) );
+                        continue;
+                    } else
+                    if("To".equals(hdr)) {
+                        msg.setRecipients( MimeMessage.RecipientType.TO, InternetAddress.parse(value) );
+                        continue;
+                    } else
+                    if("Cc".equals(hdr)) {
+                        msg.setRecipients( MimeMessage.RecipientType.CC, InternetAddress.parse(value) );
+                        continue;
+                    } else
+                    if("Bcc".equals(hdr)) {
+                        msg.setRecipients( MimeMessage.RecipientType.BCC, InternetAddress.parse(value) );
+                        continue;
+                    } else
+                    if("Attachment".equals(hdr)) {
+                        // <filename> [content-type] "comment", 
+                        String[] attachments = StringUtils.split(value, ",");
+                        Multipart multi = new MimeMultipart();
+                        mimePart.setContent(multi);
+                        for(int k=0; k<attachments.length; k++) {
+                            String attach = attachments[k];
+//                            System.err.println("Attaching: "+attach);
+                            int idx = attach.indexOf(" ");
+                            int idx2 = attach.indexOf(" ", idx+1);
+//                            System.err.println("idx:"+idx+"idx2:"+idx2);
+                            String filename = attach.substring(0,idx);
+                            InputStream in = StreamW.loadFromClasspath(filename, this);
+//                            System.err.println("IN: "+in);
+                            MimeBodyPart mbp = new MimeBodyPart();
+                            mbp.setFileName(filename);
+                            String type;
+                            if(idx2 == -1) {
+                                // no comment
+                                type = attach.substring(idx);
+                            } else {
+                                type = attach.substring(idx+1, idx2);
+                                mbp.setDescription(attach.substring(idx2+1));
+                            }
+//                            System.err.println("Type:"+type);
+                            mbp.setContent("["+attach+"]",type);
+                            multi.addBodyPart(mbp);
+                        }
+                        continue;
+                    }
+                }
+                if("Content-Type".equals(hdr)) {
+                    if(value.startsWith("multipart/")) {
+// Content-Type: multipart/mixed; boundary="FLAG"
+                        subtype   = StringUtils.getNestedString(value, "/", ";");
+                        multipart = StringUtils.getNestedString(value, "\"", "\"");
+                        mimeType = "multipart/"+subtype;
+                    } else {
+//                        System.err.println("Setting mime type to :"+value);
+                        mimePart.setHeader(hdr, value);
+                        mimeType = value;
+                    }
+                } else
+                if("Content-Transfer-Encoding".equals(hdr)) {
+                    // ignore
+                } else {
+//                    System.err.println("SETTING: "+hdr+": "+value);
+                    mimePart.setHeader(hdr, value);
+                }
+            }
+        }
+
+        String[] rest = CollectionsW.getSubArray( lines, i+1 ); 
+        body = StringUtils.join(rest, "\n");
+
+//        System.err.println("Multi: "+multipart);
+        if(multipart != null) {
+            // we know the flag at which the multipart stuff will be 
+            // shown. Then we have a body of text which should be set text?,
+            // then a chunk of text which is made up of multiple
+            //   --flag (must be at start of line)
+            //   headers:\n\n
+            //   body
+            // 
+            // everything after this list is to be ignored. 
+            // if no content-type set, then don't need a \n\n to end 
+            // a section, else you need one.
+            //
+            // 
+            
+            multipart = "\n--"+multipart+"\n";
+            String[] chunks = StringUtils.split( body, multipart );
+            MimeMultipart mu = new MimeMultipart();
+
+            // each chunks is a perfectly fine MimePart.
+            for(int j=0; j<chunks.length; j++) {
+                // TODO: try looking in chunk[j] to see if we think it's a 
+                // multipart....  if possible... can a MultiP contain a MP?
+//System.err.println("Looking at: ["+chunks[j]+"]");
+                BodyPart mp = new MimeBodyPart();
+                parseMBox(mp, chunks[j]);
+                mu.addBodyPart(mp);
+            }
+
+            mimePart.setContent( mu );
+        } else {
+            if(mimeType != null) {
+                mimePart.setContent(body, mimeType);
+            } else {
+                if(mimePart == this) {
+//System.err.println("Setting this["+body+"]");                
+                    super.setText(body);
+                } else {
+//System.err.println("Setting other["+body+"]");                
+                    mimePart.setText(body);
+                }
+            }
+        }
+    }
+
+}
diff --git a/genjava/gj-mail/src/java/com/generationjava/mail/Mailer.java b/genjava/gj-mail/src/java/com/generationjava/mail/Mailer.java
new file mode 100644
index 00000000..55262d50
--- /dev/null
+++ b/genjava/gj-mail/src/java/com/generationjava/mail/Mailer.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.mail;
+
+import java.util.Properties;
+import java.util.Map;
+import javax.mail.Transport;
+import javax.mail.Session;
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+import com.generationjava.util.Interpolator;
+import com.generationjava.namespace.SimpleNamespace;
+
+// make it easy to mail things.
+// one other idea is to allow a body only to be passed in, 
+// with the headers already set within that.
+public class Mailer {
+
+    static public Mailer getInstance(String smtp) {
+        return new Mailer(smtp);
+    }
+
+    private String smtp;
+
+    public Mailer(String smtp) {
+        this.smtp = smtp;
+    }
+
+    public Mailer() {
+        this("127.0.0.1");
+    }
+
+    public void mail(String body) throws MessagingException {
+        mail(body, null);
+    }
+
+    public void mail(String body, Map values) throws MessagingException {
+        Properties props = new Properties();
+        props.put("mail.smtp.host", smtp);
+
+        Session session = Session.getDefaultInstance(props, null);
+        MimeMessage msg = new MBoxMimeMessage(session);
+//        session.setDebug(true);
+
+        if(values != null) {
+            body = Interpolator.interpolate(body, new SimpleNamespace(values));
+        }
+
+        msg.setText(body);
+
+        Transport.send(msg);
+    }
+
+}
diff --git a/genjava/gj-scrape/LICENSE.txt b/genjava/gj-scrape/LICENSE.txt
new file mode 100644
index 00000000..38aecf65
--- /dev/null
+++ b/genjava/gj-scrape/LICENSE.txt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
diff --git a/genjava/gj-scrape/project.properties b/genjava/gj-scrape/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-scrape/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-scrape/project.xml b/genjava/gj-scrape/project.xml
new file mode 100644
index 00000000..e9dca9eb
--- /dev/null
+++ b/genjava/gj-scrape/project.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-scrape</id>
+  <name>GenJava-Scrape</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    Simple scraping component of GenJava-Core. 
+  </description>
+  
+  <shortDescription>Scraper APIs</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.7</version>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-scrape/src/java/com/generationjava/scrape/HtmlScraper.java b/genjava/gj-scrape/src/java/com/generationjava/scrape/HtmlScraper.java
new file mode 100644
index 00000000..bb18d870
--- /dev/null
+++ b/genjava/gj-scrape/src/java/com/generationjava/scrape/HtmlScraper.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.scrape;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.LinkedList;
+
+import org.apache.commons.lang.StringUtils;
+//import com.generationjava.net.UrlW;
+import com.generationjava.web.HtmlW;
+
+/// simple system in. need to now consider the move methods.
+/// then need to make sure the get method obeys internal 
+/// rules. ie) if given td.a and u find td.td, should then look 
+/// at that td? I guess so. Just as long as a tag doesn't span 
+/// another that it's not allowed to.
+
+// need to be able to say: move to b.class=blah and b=foo
+
+/// Add a moveback(String tag) method
+/// Add a getContent(int i) method to get untagged blocks of text
+public class HtmlScraper {
+
+    /*
+    static public void main(String[] args) throws IOException {
+        HtmlScraper scraper = new HtmlScraper();
+        scraper.scrape(UrlW.openUrlStream("http://www.yandell.org"));
+        System.err.println(scraper.get("TITLE").trim());
+        System.err.println(scraper.get("HEAD.TITLE").trim());
+        System.err.println(scraper.get("HTML.HEAD.TITLE").trim());
+        System.err.println(scraper.get("HTML.HEAD.META[name]"));
+        while(scraper.move("LI")) {
+            System.err.println(scraper.get("A[HREF]"));
+        }
+        System.err.println(scraper.get("LI.I"));
+    }
+    */
+
+    private String data;
+    private String page;
+
+    public HtmlScraper() {
+    }
+
+    public int getIndex() {
+        return this.page.length() - this.data.length();
+    }
+
+    /**
+     * @deprecated Do the work yourself and get the String
+     */
+    public void scrape(InputStream in) {
+        try {
+            page = ""+getContent(in);
+            reset();
+        } catch(IOException ioe) {
+            ioe.printStackTrace();
+        }
+    }
+
+    public void scrape(String text) {
+        if(text.startsWith("http://")) {
+            throw new RuntimeException("Text starts with http://. This could be bad. ");
+        }
+        this.page = text;
+        reset();
+    }
+
+    /**
+     * Move back to the start of the page.
+     */
+    public void reset() {
+        this.data = this.page;
+    }
+
+    /**
+     * Move to the specified tag. 
+     */
+     // This needs to be case-insensitive
+    public boolean move(String tag) {
+        int idx = HtmlW.getIndexOpeningTag(tag, data.substring(1));
+        if(idx == -1) {
+            return false;
+        } else {
+            idx++;
+        }
+        this.data = data.substring(idx);
+        return true;
+    }
+
+    /**
+     * Helper method.
+     * Move a number of tags.
+     */
+    public boolean move(String tag, int sz) {
+        for(int i=0; i< sz; i++) {
+            if(!move(tag)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // finds any tag with name=value attribute. Need to be able 
+    // to specify the tag really, and also the same for a value.
+    // really we need a generic search method? :)
+    // get this value, is it this. if not, find next.
+
+    // Tricky. name needs to be case-insensitive, value needs 
+    // to not be.
+    public boolean moveToTagWith(String name, String value) {
+        int idx = this.data.indexOf(name+"=\""+value+"\"");
+        if(idx == -1) {
+            idx = this.data.indexOf(name+"="+value);
+        }
+        if(idx == -1) {
+            idx = this.data.indexOf(name+"='"+value+"'");
+        }
+        if(idx == -1) {
+            return false;
+        } else {
+            idx = this.data.lastIndexOf("<", idx);
+            this.data = data.substring(idx);
+            return true;
+        }
+    }
+
+    //   moveTo a[href], www.yandell.org
+    public boolean moveTo(String get, String value) {
+        HtmlScraper scraper = new HtmlScraper();
+        scraper.scrape(this.data);
+        int count = 1;
+        while(true) {
+            boolean found = scraper.move(get);
+            if(!found) {
+                return false;
+            }
+            String chunk = scraper.get(get);
+            if( (chunk == null) || (chunk.equals("")) ) {
+                return false;
+            }
+            if(chunk.equals(value)) {
+                move(get, count);
+                break;
+            } else {
+                count++;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Move to a specified piece of text. 
+     */
+    public boolean moveToText(String text) {
+        int idx = this.data.indexOf(text);
+        if(idx == -1) {
+            return false;
+        } else {
+            this.data = data.substring(idx);
+            return true;
+        }
+    }
+
+    /**
+     * Move to a specified comment. The parameter should 
+     * not contain the HTML comment syntax.
+     */
+    public boolean moveToComment(String comment) {
+        int idx = this.data.indexOf(comment);
+        if(idx == -1) {
+            return false;
+        } else {
+            idx = data.lastIndexOf("<!", idx);
+            if(idx == -1) {
+                return false;
+            }
+            this.data = data.substring(idx);
+            return true;
+        }
+    }
+
+    /**
+     * Does the piece of text exist in this page?
+     */
+    public boolean textExists(String text) {
+        int idx = this.data.indexOf(text);
+        return (idx != -1);
+    }
+
+    /**
+     * Get the content from the current point to the
+     * specified text. 
+     */
+    public String getContentToText(String text) {
+        int idx = this.data.indexOf(text);
+        if(idx == -1) {
+            return "";
+        } else {
+            return this.data.substring(0, idx);
+        }
+    }
+
+    // find a parent tag, and get all of a child tag from it.
+    public String[] getChildren(String parent, String child) {
+         LinkedList list = new LinkedList();
+         HtmlScraper scraper = new HtmlScraper();
+         String chunk = get(parent, data);
+         scraper.scrape(chunk);
+         while(scraper.move(child)) {
+             list.add(scraper.get(child));
+         }
+         return (String[])list.toArray(new String[0]);
+    }
+
+    /**
+     * Get a value from the page. Dot-notation is used to indicate 
+     * child-tags, while [] notation is used for attributes.
+     */
+    public String get(String tag) {
+        return get(tag, this.data);
+    }
+    // Needs to be case-insensitive
+    private String get(String tag, String str) {
+        String[] strs = StringUtils.split(tag, ".");
+        for(int i=0; i<strs.length; i++) {
+            String attr = null;
+            int idx = strs[i].indexOf('[');
+            if(idx != -1) {
+                attr = StringUtils.getNestedString(strs[i], "[", "]");
+                strs[i] = strs[i].substring(0, idx);
+                int start = HtmlW.getIndexOpeningTag(strs[i], str);
+                return HtmlW.getAttribute(attr, str, start);
+            } else {
+                str = HtmlW.getContent(strs[i], str);
+            }
+        }
+        return str;
+    }
+
+    // From GenJavaCore's UrlW
+    static private Object getContent(InputStream in) throws IOException {
+        String str = loadFile(in);
+        str = StringUtils.chopNewline(str);
+        str = StringUtils.chopNewline(str);
+        return str;
+    }
+
+    /**
+     * Load the contents of a given stream. Return null if the 
+     * file is not loadable.
+     */
+     // From GenJavaCore's FileW
+    static private String loadFile(InputStream in) {
+        try {
+            int ptr = 0;
+            StringBuffer buffer = new StringBuffer();
+            while( (ptr = in.read()) != -1 ) {
+                buffer.append((char)ptr);
+            }
+            return buffer.toString();
+        } catch(IOException ioe) {
+            return null;
+        }
+    }
+
+}
diff --git a/genjava/gj-scrape/src/java/com/generationjava/scrape/package.html b/genjava/gj-scrape/src/java/com/generationjava/scrape/package.html
new file mode 100644
index 00000000..fbe076ef
--- /dev/null
+++ b/genjava/gj-scrape/src/java/com/generationjava/scrape/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <p>
+  A HtmlScraping library. Well really an Xml one.
+  </p>
+</body>
+</html> 
diff --git a/genjava/gj-scrape/src/java/com/generationjava/web/HtmlW.java b/genjava/gj-scrape/src/java/com/generationjava/web/HtmlW.java
new file mode 100644
index 00000000..6c5258e1
--- /dev/null
+++ b/genjava/gj-scrape/src/java/com/generationjava/web/HtmlW.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.web;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * HTML helping static methods.
+ */
+public class HtmlW {
+
+    /**
+     * Place &lt;br&gt;'s before each newline.
+     */
+    static public String nl2br(String str) {
+        return StringUtils.replace(str, "\n", "<br />\n");
+    }
+
+
+    /// TODO: escape all html char entitie
+    static public String escapeHtml(String str) {
+        // handles & < > " '
+        str = XmlW.escapeXml(str);
+
+        str = StringUtils.replace(str, "\u00a0", "&nbsp;");
+        str = StringUtils.replace(str, "\u00a1", "&iexcl;");
+        str = StringUtils.replace(str, "\u00a2", "&cent;");
+        str = StringUtils.replace(str, "\u00a3", "&pound;");
+        str = StringUtils.replace(str, "\u00a4", "&curren;");
+        str = StringUtils.replace(str, "\u00a5", "&yen;");
+        str = StringUtils.replace(str, "\u00a6", "&brvbar;");
+        str = StringUtils.replace(str, "\u00a7", "&sect;");
+        str = StringUtils.replace(str, "\u00a8", "&uml;");
+        str = StringUtils.replace(str, "\u00a9", "&copy;");
+        str = StringUtils.replace(str, "\u00aa", "&ordf;");
+        str = StringUtils.replace(str, "\u00ab", "&laquo;");
+        str = StringUtils.replace(str, "\u00ac", "&not;");
+        str = StringUtils.replace(str, "\u00ad", "&shy;");
+        str = StringUtils.replace(str, "\u00ae", "&reg;");
+        str = StringUtils.replace(str, "\u00af", "&macr;");
+/*
+&deg;
+&amp;#176
+&plusmn;
+&amp;#177
+&sup2;
+&amp;#178
+&sup3;
+&amp;#179
+&acute;
+&amp;#180
+&micro;
+&amp;#181
+&para;
+&amp;#182
+&middot;
+&amp;#183
+&cedil;
+&amp;#184
+&sup1;
+&amp;#185
+&ordm;
+&amp;#186
+&raquo;
+&amp;#187
+&frac14;
+&amp;#188
+&frac12;
+&amp;#189
+&frac34;
+&amp;#190
+&iquest;
+&amp;#191
+&Agrave;
+&amp;#192
+&Aacute;
+&amp;#193
+&Acirc;
+&amp;#194
+&Atilde;
+&amp;#195
+&Auml;
+&amp;#196
+&Aring;
+&amp;#197
+&AElig;
+&amp;#198
+&Ccedil;
+&amp;#199
+&Egrave;
+&amp;#200
+&Eacute;
+&amp;#201
+&Ecirc;
+&amp;#202
+&Euml;
+&amp;#203
+&Igrave;
+&amp;#204
+&Iacute;
+&amp;#205
+&Icirc;
+&amp;#206
+&Iuml;
+&amp;#207
+*/
+
+        return str;
+    }
+
+    /**
+     * Remove any html tags from a String.
+     */
+    static public String removeHtml(String str) {
+        int sz = str.length();
+        StringBuffer buffer = new StringBuffer(sz);
+        boolean inString = false;
+        boolean inTag = false;
+        for(int i=0; i<sz; i++) {
+            char ch = str.charAt(i);
+            if(ch == '<') {
+                inTag = true;
+            } else
+            if(ch == '>') {
+                inTag = false;
+            }
+            if(!inTag) {
+                buffer.append(ch);
+            }
+        }
+        return buffer.toString();
+    }
+
+    //-------------------------------------------------------------
+    // Variants of the XmlW methods that work on case-insensitivity
+    //-------------------------------------------------------------
+    static public int getIndexOpeningTag(String tag, String text) {
+        return XmlW.getIndexOpeningTag(tag.toLowerCase(), text.toLowerCase() );
+    }
+    static public int getIndexClosingTag(String tag, String text) {
+        return XmlW.getIndexClosingTag(tag.toLowerCase(), text.toLowerCase() );
+    }
+
+    // Copy of XmlW at the moment
+    static public String getContent(String tag, String text) {
+        int idx = HtmlW.getIndexOpeningTag(tag, text);
+//        System.err.println("IDX"+text+": "+idx);
+        if(idx == -1) {
+            return "";
+        }
+        text = text.substring(idx);
+        int end = HtmlW.getIndexClosingTag(tag, text);
+//        System.err.println("END[]: "+end);
+        idx = text.indexOf('>');
+//        System.err.println("EDX["+text+"]: "+idx);
+        if(idx == -1) {
+            return "";
+        }
+        return text.substring(idx+1, end);
+    }
+
+    // Copies of XmlW. Need to merge these.
+    static public String getAttribute(String attribute, String text) {
+        return getAttribute(attribute, text, 0);
+    }
+    static public String getAttribute(String attribute, String text, int idx) {
+         int close = text.indexOf(">", idx);
+         int attrIdx = text.toLowerCase().indexOf(attribute.toLowerCase()+"=\"", idx);
+         if(attrIdx == -1) {
+             return null;
+         }
+         if(attrIdx > close) {
+             return null;
+         }
+         int attrStartIdx = attrIdx + attribute.length() + 2;
+         int attrCloseIdx = text.indexOf("\"", attrStartIdx);
+         if(attrCloseIdx > close) {
+             return null;
+         }
+         return XmlW.unescapeXml(text.substring(attrStartIdx, attrCloseIdx));
+    }
+
+}
diff --git a/genjava/gj-scrape/src/java/com/generationjava/web/XmlW.java b/genjava/gj-scrape/src/java/com/generationjava/web/XmlW.java
new file mode 100644
index 00000000..0af31f88
--- /dev/null
+++ b/genjava/gj-scrape/src/java/com/generationjava/web/XmlW.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.web;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * XML helping static methods.
+ */
+final public class XmlW {
+
+    static public String escapeXml(String str) {
+        str = StringUtils.replace(str,"&","&amp;");
+        str = StringUtils.replace(str,"<","&lt;");
+        str = StringUtils.replace(str,">","&gt;");
+        str = StringUtils.replace(str,"\"","&quot;");
+        str = StringUtils.replace(str,"'","&apos;");
+        return str;
+    }
+
+    static public String unescapeXml(String str) {
+        str = StringUtils.replace(str,"&amp;","&");
+        str = StringUtils.replace(str,"&lt;","<");
+        str = StringUtils.replace(str,"&gt;",">");
+        str = StringUtils.replace(str,"&quot;","\"");
+        str = StringUtils.replace(str,"&apos;","'");
+        return str;
+    }
+
+    /**
+     * Remove any xml tags from a String.
+     * Same as HtmlW's method.
+     */
+    static public String removeXml(String str) {
+        int sz = str.length();
+        StringBuffer buffer = new StringBuffer(sz);
+        boolean inString = false;
+        boolean inTag = false;
+        for(int i=0; i<sz; i++) {
+            char ch = str.charAt(i);
+            if(ch == '<') {
+                inTag = true;
+            } else
+            if(ch == '>') {
+                inTag = false;
+                continue;
+            }
+            if(!inTag) {
+                buffer.append(ch);
+            }
+        }
+        return buffer.toString();
+    }
+
+    static public String getContent(String tag, String text) {
+        int idx = XmlW.getIndexOpeningTag(tag, text);
+        if(idx == -1) {
+            return "";
+        }
+        text = text.substring(idx);
+        int end = XmlW.getIndexClosingTag(tag, text);
+        idx = text.indexOf('>');
+        if(idx == -1) {
+            return "";
+        }
+        return text.substring(idx+1, end);
+    }
+
+    static public int getIndexOpeningTag(String tag, String text) {
+        return getIndexOpeningTag(tag, text, 0);
+    }
+    static private int getIndexOpeningTag(String tag, String text, int start) {
+        // consider whitespace?
+        int idx = text.indexOf("<"+tag, start);
+        if(idx == -1) {
+            return -1;
+        }
+        char next = text.charAt(idx+1+tag.length());
+        if( (next == '>') || Character.isWhitespace(next) ) {
+            return idx;
+        } else {
+            return getIndexOpeningTag(tag, text, idx+1);
+        }
+    }
+
+    // Pass in "para" and a string that starts with 
+    // <para> and it will return the index of the matching </para>
+    // It assumes well-formed xml. Or well enough.
+    static public int getIndexClosingTag(String tag, String text) {
+        return getIndexClosingTag(tag, text, 0);
+    }
+    static public int getIndexClosingTag(String tag, String text, int start) {
+        String open = "<"+tag;
+        String close = "</"+tag+">";
+//        System.err.println("OPEN: "+open);
+//        System.err.println("CLOSE: "+close);
+        int closeSz = close.length();
+        int nextCloseIdx = text.indexOf(close, start);
+//        System.err.println("first close: "+nextCloseIdx);
+        if(nextCloseIdx == -1) {
+            return -1;
+        }
+        int count = StringUtils.countMatches(text.substring(start, nextCloseIdx), open);
+//        System.err.println("count: "+count);
+        if(count == 0) {
+            return -1;  // tag is never opened
+        }
+        int expected = 1;
+        while(count != expected) {
+            nextCloseIdx = text.indexOf(close, nextCloseIdx+closeSz);
+            if(nextCloseIdx == -1) {
+                return -1;
+            }
+            count = StringUtils.countMatches(text.substring(start, nextCloseIdx), open);
+            expected++;
+        }
+        return nextCloseIdx;
+    }
+
+    static public String getAttr(String text, String attribute) {
+        return getAttribute(attribute, text);
+    }
+    static public String getAttr(String text, String attribute, int idx) {
+        return getAttribute(attribute, text, idx);
+    }
+
+    /**
+     * @deprecated because the parameters are the wrong way
+     */
+    static public String getAttribute(String attribute, String text) {
+        return getAttribute(attribute, text, 0);
+    }
+    /**
+     * @deprecated because the parameters are the wrong way
+     */
+    static public String getAttribute(String attribute, String text, int idx) {
+         int close = text.indexOf(">", idx);
+         int attrIdx = text.indexOf(attribute+"=\"", idx);
+         if(attrIdx == -1) {
+             return null;
+         }
+         if(attrIdx > close) {
+             return null;
+         }
+         int attrStartIdx = attrIdx + attribute.length() + 2;
+         int attrCloseIdx = text.indexOf("\"", attrStartIdx);
+         if(attrCloseIdx > close) {
+             return null;
+         }
+         return unescapeXml(text.substring(attrStartIdx, attrCloseIdx));
+    }
+
+}
diff --git a/genjava/gj-scrape/src/test/com/generationjava/scrape/HtmlScraperTest.java b/genjava/gj-scrape/src/test/com/generationjava/scrape/HtmlScraperTest.java
new file mode 100644
index 00000000..0a88379f
--- /dev/null
+++ b/genjava/gj-scrape/src/test/com/generationjava/scrape/HtmlScraperTest.java
@@ -0,0 +1,50 @@
+package com.generationjava.scrape;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+public class HtmlScraperTest extends TestCase {
+
+    public final String TEST_PAGE = "<html><body><table bgcolor=\"ffffff\"><tr><td>FOO</td></tr></table></body></html>";
+
+    public HtmlScraperTest(String name) {
+        super(name);
+    }
+
+    //-----------------------------------------------------------------------
+    // To test: 
+    //   HtmlScraper()->scrape(..)->get/move etc
+
+    public void testScrape() {
+        HtmlScraper scraper = new HtmlScraper();
+        scraper.scrape(TEST_PAGE);
+        assertEquals( "FOO", scraper.get("td") );
+    }
+
+    public void testScrapeAttribute() {
+        HtmlScraper scraper = new HtmlScraper();
+        scraper.scrape(TEST_PAGE);
+        assertEquals( "ffffff", scraper.get("table[bgcolor]") );
+    }
+
+    public void testCaseInsensitive() {
+        HtmlScraper scraper = new HtmlScraper();
+        scraper.scrape(TEST_PAGE);
+        assertEquals( "FOO", scraper.get("TD") );
+        assertEquals( "FOO", scraper.get("Td") );
+        assertEquals( "FOO", scraper.get("tD") );
+        assertEquals( "FOO", scraper.get("td") );
+    }
+    
+    public void testCaseInsensitiveAttribute() {
+        HtmlScraper scraper = new HtmlScraper();
+        scraper.scrape(TEST_PAGE);
+        assertEquals( "ffffff", scraper.get("TABLE[bgcolor]") );
+        assertEquals( "ffffff", scraper.get("TABLE[BGCOLOR]") );
+        assertEquals( "ffffff", scraper.get("table[BGCOLOR]") );
+        assertEquals( "ffffff", scraper.get("table[bgcolor]") );
+    }
+
+}
diff --git a/genjava/gj-scrape/src/test/com/generationjava/web/XmlWTest.java b/genjava/gj-scrape/src/test/com/generationjava/web/XmlWTest.java
new file mode 100644
index 00000000..ddcefd88
--- /dev/null
+++ b/genjava/gj-scrape/src/test/com/generationjava/web/XmlWTest.java
@@ -0,0 +1,27 @@
+package com.generationjava.web;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+
+public class XmlWTest extends TestCase {
+
+    public XmlWTest(String name) {
+        super(name);
+    }
+
+    //-----------------------------------------------------------------------
+    // To test: 
+    //     XmlW.removeXml
+    //     XmlW.getContent
+
+    public void testRemove() {
+        assertEquals( "FOO", XmlW.removeXml("<foo>FOO</foo>") );
+        assertEquals( "FOO", XmlW.removeXml("<foo test='blah'>FOO</foo>") );
+        assertEquals( "FOO", XmlW.removeXml("<foo><blah/>FOO</foo>") );
+        assertEquals( "FOO", XmlW.removeXml("FOO") );
+        assertEquals( "", XmlW.removeXml("") );
+    }
+
+}
diff --git a/genjava/gj-servlet/project.properties b/genjava/gj-servlet/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-servlet/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-servlet/project.xml b/genjava/gj-servlet/project.xml
new file mode 100644
index 00000000..9be33877
--- /dev/null
+++ b/genjava/gj-servlet/project.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-servlet</id>
+  <name>GenJava-Servlet</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    Servlet Components
+  </description>
+  
+  <shortDescription>Servlet Components</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>servletapi</id>
+      <version>2.3</version>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+    </dependency>
+    <dependency>
+      <id>gj-core</id>
+      <version>3.0</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-servlet/src/java/com/generationjava/namespace/ServletNamespace.java b/genjava/gj-servlet/src/java/com/generationjava/namespace/ServletNamespace.java
new file mode 100644
index 00000000..6e13212e
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/namespace/ServletNamespace.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.namespace;
+
+import java.util.Iterator;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+/**
+ * A servlet implementation of a Namespace. 
+ * The request overrides the session.
+ */
+public class ServletNamespace extends AbstractNamespace {
+
+    private HttpServletRequest request;
+    private HttpSession session;
+
+    public ServletNamespace(HttpServletRequest request) {
+        this(request,null);
+    }
+
+    public ServletNamespace(HttpServletRequest request, HttpSession session) {
+        this.request = request;
+        this.session = session;
+    }
+
+    public Object getValue(String name) {
+        Object val = this.request.getAttribute(name);
+        if(val != null) {
+            return val;
+        }
+        
+        val = this.request.getParameter(name);
+        if(val != null) {
+            return val;
+        }
+        
+        if(this.session != null) {
+            val = this.session.getAttribute(name);
+        }
+        
+        return val;
+    }
+
+    public void putValue(String name, Object info) {
+        this.request.setAttribute(name, info);
+    }
+
+    public Iterator iterateNames() {
+        return null;
+        // iterate the null thingies
+    }
+
+}
diff --git a/genjava/gj-servlet/src/java/com/generationjava/servlet/FileSystemServlet.java b/genjava/gj-servlet/src/java/com/generationjava/servlet/FileSystemServlet.java
new file mode 100644
index 00000000..f5bfe14e
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/servlet/FileSystemServlet.java
@@ -0,0 +1,85 @@
+package com.generationjava.servlet;
+
+import java.io.IOException;
+import java.io.File;
+import java.io.Writer;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import com.generationjava.io.find.FileFinder;
+import com.generationjava.io.find.Finder;
+
+public class FileSystemServlet extends HttpServlet {
+
+    public void doGet(HttpServletRequest request, 
+                      HttpServletResponse response) 
+        throws ServletException, IOException
+    {
+        ServletConfig config = getServletConfig();
+
+        // the root of the file-system
+        String root = config.getInitParameter("root");
+        
+        // pattern of files to consider
+        String filePattern = config.getInitParameter("file-pattern");
+        // pattern of dirs to consider
+        String dirsPattern = config.getInitParameter("dirs-pattern");
+        // also ones to exclude??
+
+        // a properties file mapping a mime type to a java class
+        // to display it. Must extend display(file).
+        String mimeUrl = config.getInitParameter("mime");
+        
+        // use getResource to load mime mapping. FileW.
+
+        Writer out = response.getWriter();
+        out.write("root="+root);
+        out.write("<br>");
+        out.write("file-pattern="+filePattern);
+        out.write("<br>");
+        out.write("dirs-pattern="+dirsPattern);
+        out.write("<br>");
+        out.write("mime="+mimeUrl);
+        out.write("<br>");
+
+        // if no request passed in, then run on root.
+        String target = request.getParameter("target");
+        /*
+        if(target == null) {
+            target = root;
+        } else {
+            // SECURITY. ISH.
+            target = root + target;
+        }
+        */
+        target = root;
+
+        // open request-target as a directory. 
+        Finder finder = new FileFinder();
+        File file = new File(target);
+
+        String[] found = finder.find(file);
+        for(int i=0; i<found.length; i++) {
+            out.write("+"+found[i]);
+            out.write("<br>");
+        }
+        
+        // if request-target == directory
+            // get all files in the directory that match pattern?
+            // Ask each displayer to do an iconDisplay for each one.
+            // show on a html page as clickable icons.
+        // if request-target = a file.
+            // ask its displayer to show it in long form.
+        
+        // handle the concept of a file-writing.
+        // maybe make an applet front end rather than browser someday.
+        // offer multiple views etc.
+        
+    }
+
+}
diff --git a/genjava/gj-servlet/src/java/com/generationjava/servlet/RequestMap.java b/genjava/gj-servlet/src/java/com/generationjava/servlet/RequestMap.java
new file mode 100644
index 00000000..ccfb80d6
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/servlet/RequestMap.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.servlet;
+
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.HashMap;
+
+import javax.servlet.ServletRequest;
+
+import org.apache.commons.collections.ProxyMap;
+
+/**
+ * @deprecated as not that special. Gone in 3.0.
+ */
+public class RequestMap extends ProxyMap {
+
+    public RequestMap(ServletRequest request) {
+        super(new HashMap());
+        Map map = request.getParameterMap();
+        putAll(map);
+
+        /*
+        Enumeration enum = request.getAttributeNames();
+        while(enum.hasMoreElements()) {
+            String name = (String)enum.nextElement();
+
+            String[] strings = request.getParameterValues(name);
+            int sz = strings.length;
+            for(int i=0; i<sz; i++) {
+                put(name, strings[i]);
+            }
+        }
+        */
+    }
+
+    public String getParameter(String key) {
+        return (String)get(key);
+    }
+
+}
diff --git a/genjava/gj-servlet/src/java/com/generationjava/servlet/ServletW.java b/genjava/gj-servlet/src/java/com/generationjava/servlet/ServletW.java
new file mode 100644
index 00000000..d776419b
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/servlet/ServletW.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.servlet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpUtils;
+import java.io.File;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+/**
+ * @deprecated as very tiny. Might go into the unreleased gen-j2ee. Will be gone in 3.0.
+ */
+public class ServletW {
+
+    static public String createUrl(HttpServletRequest request, String str) {
+       try {
+           return new URL( new URL("http://" + request.getServerName() +
+         ":" + request.getServerPort()),new File((new URL(HttpUtils.getRequestURL(request).toString())).getFile()).getParent() + str).toString();
+       } catch(MalformedURLException mfue) {
+           mfue.printStackTrace();
+           return str;
+       }
+    }
+
+}
diff --git a/genjava/gj-servlet/src/java/com/generationjava/servlet/package.html b/genjava/gj-servlet/src/java/com/generationjava/servlet/package.html
new file mode 100644
index 00000000..55ad6d41
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/servlet/package.html
@@ -0,0 +1,7 @@
+<html>
+<body>
+  <p>
+  Helpers for javax.servlet.
+  </p>
+</body>
+</html> 
diff --git a/genjava/gj-servlet/src/java/com/generationjava/taglib/AbstractBodyTag.java b/genjava/gj-servlet/src/java/com/generationjava/taglib/AbstractBodyTag.java
new file mode 100644
index 00000000..487e5d62
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/taglib/AbstractBodyTag.java
@@ -0,0 +1,61 @@
+package com.generationjava.taglib;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import java.util.Properties;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+/**
+ * Abstract class for the Taglibs.
+ * It has a param ability which binds to a generic ParamTag.
+ * 
+ * @author bayard@generationjava.com
+ * @version 0.1, 20011028
+ */
+abstract public class AbstractBodyTag extends BodyTagSupport {
+
+    private Properties params;
+
+    /**
+     * Empty constructor. Initialises the attributes.
+     */
+    public AbstractBodyTag() {
+        initAttributes();
+    }
+
+    // code to handle adding params..
+    /**
+     * Set a param.
+     */
+    public void putParam(String name, String value) {
+        if(params == null) {
+            params = new Properties();
+        }
+        params.put(name, value);
+    }
+
+    /**
+     * Get a param out.
+     */
+    public String getParam(String name) {
+        if(params == null) {
+            return null;
+        }
+        return params.getProperty(name);
+    }
+
+    /**
+     * Initialise any properties to default values.
+     * This method is called upon construction.
+     * This is a default empty implementation.
+     */
+    public void initAttributes() {
+        params.clear();
+    }
+
+}
diff --git a/genjava/gj-servlet/src/java/com/generationjava/taglib/AbstractStringBodyTag.java b/genjava/gj-servlet/src/java/com/generationjava/taglib/AbstractStringBodyTag.java
new file mode 100644
index 00000000..2a12f35f
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/taglib/AbstractStringBodyTag.java
@@ -0,0 +1,66 @@
+package com.generationjava.taglib;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+
+/**
+ * Abstract class for the Taglibs.
+ * It handles the JSP taglib side of things and calls abstract 
+ * protected methods to delegate the actual body functionality.
+ * 
+ * @author bayard@generationjava.com
+ * @version 0.1, 20011028
+ */
+abstract public class AbstractStringBodyTag extends AbstractBodyTag {
+
+    /**
+     * Empty constructor.
+     */
+    public AbstractStringBodyTag() {
+        super();
+    }
+
+    /**
+     * Handles the manipulation of the String tag,
+     * evaluating the body of the tag. The evaluation 
+     * is delegated to the actOnBody(String) method 
+     * and then the initAttributes() method is called.
+     */
+    public int doEndTag() throws JspException {
+
+        if( (bodyContent == null) ) {
+            return SKIP_BODY;
+        }
+        String text = "";
+        if(bodyContent != null) {
+            StringWriter body = new StringWriter();
+            try {
+                bodyContent.writeOut(body);
+                text = body.toString();
+            } catch(IOException ioe) {
+                ioe.printStackTrace();
+            }
+        }
+        JspWriter writer = pageContext.getOut();
+        try {
+            actOnBody(text);
+            initAttributes();
+        } catch (IOException e) {
+            throw new JspException(e.toString());
+        }
+
+        return (SKIP_BODY);
+    }
+
+    /** 
+     * Perform an operation on the passed in String.
+     *
+     * @param str String to be manipulated
+     */
+    abstract public void actOnBody(String str) throws IOException;
+
+}
diff --git a/genjava/gj-servlet/src/java/com/generationjava/taglib/ParamTag.java b/genjava/gj-servlet/src/java/com/generationjava/taglib/ParamTag.java
new file mode 100644
index 00000000..922340ab
--- /dev/null
+++ b/genjava/gj-servlet/src/java/com/generationjava/taglib/ParamTag.java
@@ -0,0 +1,52 @@
+package com.generationjava.taglib;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
+
+/**
+ * <xxxx:param name="order" value="reverse"/>
+ *
+ * @author bayard@generationjava.com
+ * @version 0.1, 20011030
+ */
+public class ParamTag extends TagSupport {
+
+    private String name;
+    private String value;
+
+    /**
+     * Empty constructor. 
+     */
+    public ParamTag() {
+        super();
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Initialise any properties to default values.
+     */
+    public void initAttributes() {
+    }
+
+    /// TODO: Implement its doing method. This would look at its 
+    ///       parent, and if it is of type AbstractBodyTag, then it 
+    ///       puts itself into the tag. Maybe use an Interface instead.
+
+}
diff --git a/genjava/gj-tools/LICENSE.txt b/genjava/gj-tools/LICENSE.txt
new file mode 100644
index 00000000..38aecf65
--- /dev/null
+++ b/genjava/gj-tools/LICENSE.txt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
diff --git a/genjava/gj-tools/project.properties b/genjava/gj-tools/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-tools/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-tools/project.xml b/genjava/gj-tools/project.xml
new file mode 100644
index 00000000..9e0b9a08
--- /dev/null
+++ b/genjava/gj-tools/project.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-tools</id>
+  <name>GenJava-Tools</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    A Tools API to make it simpler to write command line tools.
+  </description>
+  
+  <shortDescription>Tools API</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.7</version>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>2.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+    <dependency>
+      <id>commons-cli</id>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/cli/</url>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/collections.html</url>
+    </dependency>
+    <dependency>
+      <id>gj-core</id>
+      <version>3.0</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-tools/src/java/com/generationjava/net/WGet.java b/genjava/gj-tools/src/java/com/generationjava/net/WGet.java
new file mode 100644
index 00000000..c31ecbc9
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/net/WGet.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.net;
+
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+
+/**
+ * Simple class allowing URLs to be obtained.
+ */
+public class WGet {
+
+    // full url: http://www.generationjava.com/
+    /**
+     * Provide a string url and it downloads the contents at 
+     * that url.
+     */
+    public String downloadPage(String urlStr) {
+        if(urlStr.indexOf("http://") == -1) {
+            urlStr = "http://"+urlStr;
+        } 
+        StringBuffer sb = new StringBuffer();
+        URL url = null;
+        try {
+            url = new URL(urlStr);
+        } catch(MalformedURLException mue) {
+            System.err.println("Had nasty url: "+urlStr);
+            mue.printStackTrace();
+            return "";
+        }
+        try {
+            InputStream is = url.openStream();
+            BufferedReader bis = new BufferedReader(new InputStreamReader(is));
+            String line = null;
+            while( (line = bis.readLine()) != null) {
+                sb.append(line);
+            }
+        } catch(IOException ioe) {
+            System.err.println("Had problems with: "+urlStr);
+            ioe.printStackTrace();
+        }
+        return sb.toString();
+    }
+}
diff --git a/genjava/gj-tools/src/java/com/generationjava/tools/AbstractTool.java b/genjava/gj-tools/src/java/com/generationjava/tools/AbstractTool.java
new file mode 100644
index 00000000..c6dc3895
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/tools/AbstractTool.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.tools;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.PatternOptionBuilder;
+import org.apache.commons.cli.ParseException;
+
+import org.apache.commons.lang.exception.NestableRuntimeException;
+
+abstract public class AbstractTool implements Tool {
+
+    public CommandLine getCArgs(String flags, String[] args) {
+        try {
+            return new PosixParser().parse(PatternOptionBuilder.parsePattern(flags), args);
+        } catch(ParseException pe) {
+            throw new NestableRuntimeException(pe);
+        }
+    }
+
+    abstract public void runTool(String[] args) throws ToolException;
+
+}
diff --git a/genjava/gj-tools/src/java/com/generationjava/tools/CommandLineToolRunner.java b/genjava/gj-tools/src/java/com/generationjava/tools/CommandLineToolRunner.java
new file mode 100644
index 00000000..6f7d9e05
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/tools/CommandLineToolRunner.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.tools;
+
+import com.generationjava.lang.ClassW;
+
+public class CommandLineToolRunner {
+
+    public CommandLineToolRunner() {
+    }
+
+    public boolean runTool(Class clss, String[] args) {
+        Object obj = ClassW.createObject(clss);
+        if(obj instanceof Tool) {
+            return runTool((Tool)obj, args);
+        } else {
+            System.err.println("Class "+clss.getName()+" is not an instance of com.generationjava.tools.Tool");
+            return false;
+        }
+    }
+    public boolean runTool(Tool tool, String[] args) {
+        try {
+            tool.runTool(args);
+            return true;
+        } catch(ToolException te) {
+            System.err.println(te.getMessage());
+            return false;
+        }
+    }
+
+}
diff --git a/genjava/gj-tools/src/java/com/generationjava/tools/Run.java b/genjava/gj-tools/src/java/com/generationjava/tools/Run.java
new file mode 100644
index 00000000..77c04f69
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/tools/Run.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.tools;
+
+import com.generationjava.collections.CollectionsW;
+import com.generationjava.lang.ClassW;
+import org.apache.commons.lang.StringUtils;
+import com.generationjava.util.PropertiesLoader;
+import java.util.Properties;
+
+/**
+ * A class which runs tools.
+ */
+public class Run {
+
+    static public void main(String[] strs) {
+        /*
+        PropertiesLoader pl = new PropertiesLoader();
+        Properties props = pl.findProperties("com/generationjava/test/test.properties");
+        if(props != null) {
+            String location = props.getProperty("scaffold.package");
+            if (strs[0].indexOf(".") == -1) {
+                strs[0] = location+"."+strs[0];
+            }
+            if (strs[0].indexOf("Scaffold") == -1) {
+                strs[0] += "Scaffold";
+            }
+        } else {
+            System.err.println("Can't find com.generationjava.test.test.properties.");
+        }
+        */
+        strs[0] = "com.generationjava.tools."+StringUtils.capitalise(strs[0])+"Tool";
+
+        CommandLineToolRunner cltr = new CommandLineToolRunner();
+        cltr.runTool(ClassW.getClass(strs[0]), CollectionsW.getSubArray(strs,1));
+    }
+
+}
diff --git a/genjava/gj-tools/src/java/com/generationjava/tools/Tool.java b/genjava/gj-tools/src/java/com/generationjava/tools/Tool.java
new file mode 100644
index 00000000..c3d2eeb1
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/tools/Tool.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.tools;
+
+import org.apache.commons.cli.CommandLine;
+
+public interface Tool {
+
+    public CommandLine getCArgs(String flags, String[] args);
+
+    public void runTool(String[] args) throws ToolException;
+
+}
diff --git a/genjava/gj-tools/src/java/com/generationjava/tools/ToolException.java b/genjava/gj-tools/src/java/com/generationjava/tools/ToolException.java
new file mode 100644
index 00000000..63fb717d
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/tools/ToolException.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.tools;
+
+import org.apache.commons.lang.exception.NestableException;
+
+public class ToolException extends NestableException {
+
+    public ToolException() {
+        super();
+    }
+
+    public ToolException(String msg) {
+        super(msg);
+    }
+
+    public ToolException(Throwable t) {
+        super(t);
+    }
+
+    public ToolException(String msg, Throwable t) {
+        super(msg,t);
+    }
+
+}
diff --git a/genjava/gj-tools/src/java/com/generationjava/util/ClassFinder.java b/genjava/gj-tools/src/java/com/generationjava/util/ClassFinder.java
new file mode 100644
index 00000000..019cc258
--- /dev/null
+++ b/genjava/gj-tools/src/java/com/generationjava/util/ClassFinder.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.zip.ZipFile;
+import java.util.zip.ZipEntry;
+import java.util.Iterator;
+
+import org.apache.commons.collections.IteratorUtils;
+import org.apache.commons.lang.StringUtils;
+import com.generationjava.tools.AbstractTool;
+import com.generationjava.tools.CommandLineToolRunner;
+
+import org.apache.commons.cli.CommandLine;
+
+/**
+ * Find a Class by name. That is, find the directory or jar it is in.
+ */
+public class ClassFinder extends AbstractTool {
+
+    // add an argument to return all duplicate fqnames in jars
+    static public void main(String[] strs) {
+        CommandLineToolRunner cltr = new CommandLineToolRunner();
+        cltr.runTool(ClassFinder.class, strs);
+    }
+
+    public void runTool(String[] strs) {
+        CommandLine cargs = getCArgs("fc:", strs);
+        ClassFinder cf = new ClassFinder();
+
+        if(cargs.hasOption("c")) {
+            cf.setClasspath((String)cargs.getOptionValue("c"));
+        }
+
+        boolean fail = cargs.hasOption("f");
+
+        for(int i=0;i<strs.length;i++) {
+            if(fail) {
+                if(cf.findClass(strs[i]) == null) {
+                    System.out.println(strs[i]);
+                }
+            } else {
+                System.out.println(cf.findClass(strs[i]));
+            }
+        }
+    }
+
+    private String classpath;
+
+    public ClassFinder() {
+        this(System.getProperty("java.class.path"));
+    }
+
+    public ClassFinder(String classpath) {
+        setClasspath(classpath);
+    }
+
+    public void setClasspath(String classpath) {
+        this.classpath = classpath;
+    }
+
+    /**
+     * Find the filename that the passed in classname exists in.
+     * Returns null if it couldn't find the location.
+     */
+    public String findClass(String name) {
+        // check the class exists in classpath
+        // here we assume the JVM is far more efficient
+        // than us.
+        try {
+            Class.forName(name);
+        } catch (ClassNotFoundException cnfe) {
+            return null;
+        }
+
+        // get System classpath property
+//        String classpath = System.getProperty("java.class.path");
+
+        // convert name from blah.blah to blah/blah
+        String filename = name.replace('.','\\') + ".class";
+        String reversename = name.replace('.','/') + ".class";
+
+        // explode String
+        String[] paths = StringUtils.split(this.classpath, File.pathSeparator);
+
+        for (int i = 0; i < paths.length; i++) {
+            String path = paths[i];
+            File file = new File(path);
+            if (file.isDirectory()) {
+                File file2 = new File(path + filename);
+                if (file2.exists()) {
+                    return path + filename;
+                }
+            } else {
+                // jar. need to open and look.
+                try {
+                    ZipFile zip = new ZipFile(file);
+                    Iterator iterator =
+                            IteratorUtils.asIterator(zip.entries());
+                    while (iterator.hasNext()) {
+                        ZipEntry entry = (ZipEntry) iterator.next();
+                        String zipname = entry.getName();
+                        if(zipname.equals(filename)) {
+                            return path+":"+filename;
+                        }
+                        if(zipname.equals(reversename)) {
+                            return path+":"+reversename;
+                        }
+                    }
+                    zip.close();
+                } catch(IOException ioe) {
+                    ioe.printStackTrace();
+                    System.err.println("BAD: "+file);
+                    continue;
+                }
+            }
+        }
+
+        // damn. can't find it. and yet it exists.
+        return null;
+    }
+
+
+}
diff --git a/genjava/gj-xml/LICENSE.txt b/genjava/gj-xml/LICENSE.txt
new file mode 100644
index 00000000..38aecf65
--- /dev/null
+++ b/genjava/gj-xml/LICENSE.txt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
diff --git a/genjava/gj-xml/project.properties b/genjava/gj-xml/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/gj-xml/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/gj-xml/project.xml b/genjava/gj-xml/project.xml
new file mode 100644
index 00000000..7b72a205
--- /dev/null
+++ b/genjava/gj-xml/project.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<project>
+  <extend>../project.xml</extend>
+  <id>gj-xml</id>
+  <name>GenJava-XML</name>
+  <currentVersion>1.0</currentVersion>
+  <inceptionYear>2002</inceptionYear>
+  
+  <description>
+    XML parser component of GenJava-Core. 
+  </description>
+  
+  <shortDescription>XML Parser</shortDescription>
+
+  <dependencies>
+    <dependency>
+      <id>junit</id>
+      <version>3.7</version>
+    </dependency>
+  </dependencies>
+
+</project>
+
diff --git a/genjava/gj-xml/src/java/com/generationjava/io/xml/XMLNode.java b/genjava/gj-xml/src/java/com/generationjava/io/xml/XMLNode.java
new file mode 100644
index 00000000..72e59be3
--- /dev/null
+++ b/genjava/gj-xml/src/java/com/generationjava/io/xml/XMLNode.java
@@ -0,0 +1,415 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.io.xml;
+
+import java.util.Hashtable;
+import java.util.Enumeration;
+import java.util.Vector;
+
+/**
+ * An xml tag. It can be a processing instructon, an empty tag or 
+ * a normal tag. Currently, if the tag is inside a namespace then 
+ * that is a part of the name. That is, all names of tags are 
+ * fully qualified by the namespace.
+ */
+public class XMLNode {
+
+    static private Enumeration EMPTY = new NullEnumeration();
+
+    private Hashtable myAttrs;
+    private Hashtable myNodes;  // allows quick lookup
+    private Vector myNodeList;  // maintains order of myNodes
+    private String name;
+    private String value;
+    private boolean pi;
+    private boolean comment;
+    private boolean doctype;
+
+    /**
+     * Empty Constructor.
+     */
+    public XMLNode() {
+        this("");
+    }
+    
+    /**
+     * Create a new node with this name.
+     */
+    public XMLNode(String name) {
+        this.name = name;
+    }
+    
+    /**
+     * Add a child node to this node.
+     */
+    public void addNode(XMLNode node) {
+        if(this.myNodes == null) {
+            this.myNodes = new Hashtable();
+            this.myNodeList = new Vector();
+        }
+        this.myNodeList.add(node);
+        Object obj = this.myNodes.get( node.getName() );
+        if(obj == null) {
+            this.myNodes.put( node.getName(), node );
+        } else
+        if(obj instanceof XMLNode) {
+            Vector vec = new Vector();
+            vec.addElement(obj);
+            vec.addElement(node);
+            this.myNodes.put( node.getName(), vec );
+        } else
+        if(obj instanceof Vector) {
+            Vector vec = (Vector)obj;
+            vec.addElement(node);
+        }
+    }
+
+    // Enumerates a child node. Possibly needs renaming.
+    // That is, it enumerates a child nodes value.
+    /**
+     *
+     */
+    public Enumeration enumerateNode(String name) {
+        if(this.myNodes == null) {
+            return EMPTY;
+        }
+        Object obj = this.myNodes.get( name );
+        if(obj == null) {
+            return EMPTY;
+        } else 
+        if(obj instanceof Vector) {
+            return ((Vector)obj).elements();
+        } else {
+            return EMPTY;
+        }
+    }
+
+    /**
+     * Add an attribute with specified name and value.
+     */
+    public void addAttr(String name, String value) {
+        if(this.myAttrs == null) {
+            this.myAttrs = new Hashtable();
+        }
+        this.myAttrs.put( name, value );
+    }
+    
+    /**
+     * Get the attribute with the specified name.
+     */
+    public String getAttr(String name) {
+        if(myAttrs == null) {
+            return null;
+        }
+        return (String)this.myAttrs.get(name);
+    }
+    
+    /**
+     * Enumerate over all the attributes of this node.
+     * In the order they were added.
+     */
+    public Enumeration enumerateAttr() {
+        if(this.myAttrs == null) {
+            return EMPTY;
+        } else {
+            return this.myAttrs.keys();
+        }
+    }
+
+    /**
+     * Get the node with the specified name.
+     */
+    public XMLNode getNode(String name) {
+        if(this.myNodes == null) {
+            return null;
+        }
+        Object obj = this.myNodes.get(name);
+        if(obj instanceof XMLNode) {
+            return (XMLNode)obj;
+        }
+        return null;
+    }
+    
+    /**
+     * Enumerate over all of this node's children nodes.
+     */
+    public Enumeration enumerateNode() {
+        if(this.myNodes == null) {
+            return EMPTY;
+        } else {
+//        return this.myNodes.elements();
+        return this.myNodeList.elements();
+        }
+    }
+    
+    /**
+     * Get the name of this node. Includes the namespace.
+     */
+    public String getName() {
+        return this.name;
+    }
+
+    /**
+     * Get the namespace of this node.
+     */
+    public String getNamespace() {
+        if(this.name.indexOf(":") != -1) {
+            return this.name.substring(0,this.name.indexOf(":"));
+        } else {
+            return "";
+        }
+    }
+
+    /**
+     * Get the tag name of this node. Doesn't include namespace.
+     */
+    public String getTagName() {
+        if(this.name.indexOf(":") != -1) {
+            return this.name.substring(this.name.indexOf(":")+1);
+        } else {
+            return this.name;
+        }
+    }
+
+    /**
+     * Get the appended toString's of the children of this node.
+     * For a text node, it will print out the plaintext.
+     */
+    public String getValue() {
+        if(isComment()) {
+            return "<!-- " + value + " -->";
+        }
+        if(isDocType()) {
+            return "<!DOCTYPE " + value + ">";
+        }
+        if(this.value != null) {
+            return this.value;
+        }
+        if(isInvisible()) {
+            return "";
+        }
+        // QUERY: shouldnt call toString. Needs to improve
+        if(this.myNodeList != null) {
+            StringBuffer buffer = new StringBuffer();
+            Enumeration enum = enumerateNode();
+            while(enum.hasMoreElements()) {
+                buffer.append(enum.nextElement().toString());
+            }
+            return buffer.toString();
+        }
+        return null;
+    }
+    
+    /**
+     * Set the plaintext contained in this node.
+     */
+    public void setPlaintext(String str) {
+        this.value = str;
+    }
+
+    /**
+     * Is this a normal tag?
+     * That is, not plaintext, not comment and not a pi.
+     */
+    public boolean isTag() {
+        return !(this.pi || (this.name == null) || (this.value != null));
+    }
+
+    /**
+     * Is it invisible
+     */
+    public boolean isInvisible() {
+        return this.name == null;
+    }
+    
+    /**
+     * Set whether this node is invisible or not.
+     */
+    public void setInvisible(boolean b) {
+        if(b) {
+            this.name = null;
+        }
+    }
+    
+    /**
+     * Is it a doctype
+     */
+    public boolean isDocType() {
+        return this.doctype;
+    }
+    
+    /**
+     * Set whether this node is a doctype or not.
+     */
+    public void setDocType(boolean b) {
+        this.doctype = b;
+    }
+    
+    /**
+     * Is it a comment
+     */
+    public boolean isComment() {
+        return this.comment;
+    }
+    
+    /**
+     * Set whether this node is a comment or not.
+     */
+    public void setComment(boolean b) {
+        this.comment = b;
+    }
+    
+    /**
+     * Is it a processing instruction    
+     */
+    public boolean isPI() {
+        return this.pi;
+    }
+    
+    /**
+     * Set whether this node is a processing instruction or not.
+     */
+    public void setPI(boolean b) {
+        this.pi = b;
+    }
+    
+    // IMPL: Assumes that you're unable to remove nodes from 
+    //          a parent node. removeNode and removeAttr is likely to 
+    //          become a needed functionality.
+    /**
+     * Is this node empty.
+     */
+    public boolean isEmpty() {
+        return (this.myNodes == null);
+    }
+
+    /**
+     * Is this a text node.
+     */
+    public boolean isTextNode() {
+        return ((this.value != null) && !comment && !doctype && !pi);
+    }
+
+    // not entirely necessary, but allows XMLNode's to be output 
+    // int XML by calling .toString() on the root node.
+    // Probably wants some indentation handling?
+    /**
+     * Turn this node into a String. Outputs the node as 
+     * XML. So a large amount of output.
+     */
+    public String toString() {
+        if(isComment()) {
+            return "<!-- " + value + " -->";
+        }
+        if(isDocType()) {
+            return "<!DOCTYPE " + value + ">";
+        }
+        if(value != null) {
+            return value;
+        }
+
+        StringBuffer tmp = new StringBuffer();
+
+        if(!isInvisible()) {
+            tmp.append("<");
+            if(isPI()) {
+                tmp.append("?");
+            }
+            tmp.append(name);
+        }
+        
+        Enumeration enum = enumerateAttr();
+        while(enum.hasMoreElements()) {
+            tmp.append(" ");
+            String obj = (String)enum.nextElement();
+            tmp.append(obj);
+            tmp.append("=\"");
+            tmp.append(getAttr(obj));
+            tmp.append("\"");
+        }
+        if(isEmpty()) {
+            if(isPI()) {
+                tmp.append("?>");
+            } else {
+                if(!isInvisible()) {
+                    tmp.append("/>");
+                }
+            }
+        } else {
+            if(!isInvisible()) {
+                tmp.append(">");
+            }
+
+            tmp.append(bodyToString());
+
+            if(!isInvisible()) {
+                tmp.append("</"+name+">\n");
+            }
+        }
+        return tmp.toString();
+    }
+            
+    /**
+     * Get the String version of the body of this tag.
+     */
+    public String bodyToString() {
+        StringBuffer tmp = new StringBuffer();
+        Enumeration enum = enumerateNode();
+        while(enum.hasMoreElements()) {
+            Object obj = enum.nextElement();
+            if(obj instanceof XMLNode) {
+                XMLNode node = (XMLNode)obj;
+                tmp.append(node);
+            } else
+            if(obj instanceof Vector) {
+                Vector nodelist = (Vector)obj;
+                Enumeration nodeEnum = nodelist.elements();
+                while(nodeEnum.hasMoreElements()) {
+                    XMLNode node = (XMLNode)nodeEnum.nextElement();
+                    tmp.append(node);
+                }
+            }                
+        }
+        return tmp.toString();
+    }
+        
+}
+
+class NullEnumeration implements Enumeration {
+    public Object nextElement() {
+        return null;
+    }
+ 
+    public boolean hasMoreElements() {
+        return false;
+    }   
+}
diff --git a/genjava/gj-xml/src/java/com/generationjava/io/xml/XMLParser.java b/genjava/gj-xml/src/java/com/generationjava/io/xml/XMLParser.java
new file mode 100644
index 00000000..0e6d81e2
--- /dev/null
+++ b/genjava/gj-xml/src/java/com/generationjava/io/xml/XMLParser.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.generationjava.io.xml;
+
+import java.io.Reader;
+import java.io.IOException;
+import java.util.Stack;
+
+/**
+ * A tiny parser of xml text. It is intended to deal with simple 
+ * config files.
+ */
+public class XMLParser {
+
+    // various states in which the parser may be.
+    static final private int VACUUM = 1;
+    static final private int IN_TAG = 2;
+    static final private int IN_TAG_NAME = 3;
+    static final private int CLOSING_TAG = 9;
+    static final private int SLASH = 4;
+    static final private int ATTR_NAME = 5;
+    static final private int END_ATTR_NAME = 6;
+    static final private int ATTR_VALUE = 7;
+    static final private int END_ATTR_VALUE = 8;
+    static final private int START_COMMENT = 10;
+    static final private int IN_COMMENT = 11;
+    // special state to handle the DOCTYPE 'tag'
+    static final private int IN_DOCTYPE = 12;
+    static final private int IN_DTD = 13;
+
+    public XMLParser() {
+    }
+    
+    /**
+     * Parse an XML text read in from a Reader.
+     * Returns the root node of the xml text.
+     */
+    public XMLNode parseXML(Reader reader) throws IOException {
+        int state = VACUUM;
+        int x = 1;   // current character number 
+        int y = 1;   // current line number
+        int rch = 0;
+        char ch;
+        boolean pi = false;
+        
+        StringBuffer tag_name = new StringBuffer();
+        StringBuffer attr_name = new StringBuffer();
+        StringBuffer attr_value = new StringBuffer();
+        StringBuffer value = new StringBuffer();
+
+        XMLNode root = null;
+        XMLNode node = null;
+        
+        
+        // the current parent.
+        XMLNode parent = null;
+        
+        // Stack is used to remember the hierarchy of parents.
+        Stack stack = new Stack();
+        
+        while( (rch = reader.read()) != -1) {
+            ch = (char)rch;
+            // QUERY: Should newlines only be allowed in a VACUUM ?
+            // error messaging
+            x++;
+            if(ch == '\n') {
+                y++;
+                x = 1;
+                continue;
+            }
+            
+            switch(state) {
+              case VACUUM: {
+                  if(ch == '<') {
+                    pi = false;
+                    state = IN_TAG_NAME;
+                    if( value.length() != 0 ) {
+                        node = new XMLNode(tag_name.toString());
+                        node.setPlaintext(value.toString().trim());
+                        parent.addNode(node);
+                        value.setLength(0);
+                    }
+                  } else
+                  if( (ch == ' ') || (ch == '\t') ) {
+                    if(value.length() != 0) {
+                        value.append(ch);
+                    }
+                    continue;
+                  } else
+                  if(ch == '\r') {   // part of a newline.
+                    if(value.length() != 0) {
+                        value.append(ch);
+                    }
+                    continue;
+                  } else {
+                    value.append(ch);
+                  }
+              }
+              break;
+              
+              case START_COMMENT: {
+                  if(ch == '-') {
+                      // feels bad to do this here.
+                      ch = (char)reader.read();
+                      if(ch == '-') {
+                          state = IN_COMMENT;
+                      } else {
+                          value.append("!-");
+                          value.append(ch);
+                      }
+                  } else {
+                      tag_name.append('!');
+                      tag_name.append(ch);
+                      state = IN_TAG_NAME;
+                  }
+              }
+              break;
+
+              case IN_COMMENT: {
+                  if(ch == '-') {
+                      // feels bad to do this here.
+                      ch = (char)reader.read();
+                      if(ch == '-') {
+                          ch = (char)reader.read();
+                          if(ch == '>') {
+                              node = new XMLNode();
+                              node.setPlaintext(value.toString().trim());
+                              node.setComment(true);
+                              if(parent == null) {
+                                  parent = new XMLNode();
+                                  parent.setInvisible(true);
+                                  root = parent;
+                              }
+                              parent.addNode(node);
+                              value.setLength(0);
+                              state = VACUUM;
+                          } else {
+                              value.append("--");
+                              value.append(ch);
+                          }
+                      } else {
+                          value.append("-");
+                          value.append(ch);
+                      }
+                  } else {
+                      value.append(ch);
+                  }
+              }
+              break;
+
+              case IN_DOCTYPE: {
+                  if(ch == '[') {
+                      value.append(ch);
+                      state = IN_DTD;
+                  } else
+                  if(ch == '>') {
+                      node = new XMLNode("!DOCTYPE");
+                      node.setPlaintext(value.toString());
+                      node.setDocType(true);
+                      if(parent == null) {
+                          parent = new XMLNode();
+                          parent.setInvisible(true);
+                          root = parent;
+                      }
+                      parent.addNode(node);
+                      value.setLength(0);
+                      state = VACUUM;
+                  } else {
+                      value.append(ch);
+                  }
+              }
+              break;
+
+              case IN_DTD: {
+                  if(ch == ']') {
+                      value.append(ch);
+                      state = IN_DOCTYPE;
+                  } else {
+                      value.append(ch);
+                  }
+              }
+
+              case IN_TAG_NAME: {
+                  if( (ch == '!') && (tag_name.length() == 0) ) {
+                    state = START_COMMENT;
+                  } else
+                  if( !pi && (ch == '?') && (tag_name.length() == 0) ) {
+                    pi = true;
+                  } else
+                  if( (ch == '/') && (tag_name.length() == 0) ) {
+                    // closing tag
+                    parent = (XMLNode)stack.pop();
+                    state = CLOSING_TAG;
+                  } else
+                  if( ((ch == ' ') || (ch == '\t') || (ch == '>') || (ch == '/')) || (ch == '?') ) {
+                    if("!DOCTYPE".equals(tag_name.toString())) {
+                        state = IN_DOCTYPE;
+                        tag_name.setLength(0);
+                        continue;
+                    }
+                    if(pi) {
+                      if(parent == null) {
+                          parent = new XMLNode();
+                          parent.setInvisible(true);
+                          root = parent;
+                      }
+                    }
+                    node = new XMLNode(tag_name.toString());
+                    node.setPI(pi);
+                    pi = false;
+                    if(root == null) {
+                        root = node;
+                    }
+                    if(parent != null) {
+                        parent.addNode(node);
+                    }
+                    tag_name.setLength(0);
+                    if( (ch == '/') || (ch == '?') ) {
+                        state = SLASH;
+                    } else
+                    if(ch == '>') {
+                        state = VACUUM;
+                        stack.push(parent);
+                        parent = node;
+                    } else {
+                        state = IN_TAG;
+                    }
+                  } else {
+                    tag_name.append(ch);
+                  }
+              }
+              break;
+              
+              case IN_TAG: {
+                  if((ch == ' ') || (ch == '\t') ) {
+                    continue;
+                  } else
+                  if(ch == '>') {
+                    state = VACUUM;
+                    stack.push(parent);
+                    parent = node;
+                  } else
+                  if( (ch == '/') || (ch == '?') ) {
+                    // empty tag
+                    state = SLASH;
+                  } else {
+                    state = ATTR_NAME;
+                    attr_name.setLength(1);
+                    attr_name.setCharAt(0,ch);
+                  }
+              }
+              break;
+                            
+              case SLASH: {
+                  if(ch == '>') {
+                    state = VACUUM;
+                  } else {
+                    state = IN_TAG;
+                  }
+              }
+              break;
+              
+              case CLOSING_TAG: {
+                  if(ch == '>') {
+                      state = VACUUM;
+                  } else {
+                      continue;
+                  }
+              }
+              break;
+                            
+              case ATTR_NAME: {
+                  if((ch == ' ') || (ch == '\t') ) {
+                    node.addAttr(attr_name.toString(), attr_name.toString());
+                    state = IN_TAG;
+                  } else
+                  if(ch == '=') {
+                    state = END_ATTR_NAME;
+                  } else {
+                    attr_name.append(ch);
+                  }
+              }
+              break;
+              
+              case END_ATTR_NAME: {
+                  if(ch == '"') {
+                    state = ATTR_VALUE;
+                    attr_value.setLength(0);
+                  } else {
+                    state = ATTR_NAME;
+                  }
+              }
+              break;
+              
+              case ATTR_VALUE: {
+                  if(ch == '"') {
+                    node.addAttr(attr_name.toString(), attr_value.toString());
+                    state = IN_TAG;
+                  } else {
+                    attr_value.append(ch);
+                  }
+              }
+              break;
+            }
+        }
+        return root;
+    }
+
+}
diff --git a/genjava/gj-xml/src/java/com/generationjava/util/XmlProperties.java b/genjava/gj-xml/src/java/com/generationjava/util/XmlProperties.java
new file mode 100644
index 00000000..8ec64751
--- /dev/null
+++ b/genjava/gj-xml/src/java/com/generationjava/util/XmlProperties.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Genjava-Core 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.
+ */
+// XmlProperties.java
+package com.generationjava.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.InputStream;
+import java.io.File;
+import java.io.FileReader;
+import java.io.Reader;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+import java.util.Properties;
+import java.util.Enumeration;
+
+import com.generationjava.io.xml.XMLParser;
+import com.generationjava.io.xml.XMLNode;
+
+/**
+ */
+public class XmlProperties extends Properties {
+
+    static public XmlProperties load(File file) {
+        XmlProperties props = new XmlProperties();
+        return props;
+    }
+
+    public XmlProperties() {
+        super();
+    }
+
+    public XmlProperties(Properties props) {
+        super(props);
+    }
+
+    public void load(InputStream in) throws IOException {
+        InputStreamReader reader = new InputStreamReader(in);
+        this.load( reader );
+        reader.close();
+    }
+
+    public void load(Reader reader) throws IOException {
+        XMLParser parser = new XMLParser();
+        XMLNode root = parser.parseXML(reader);
+        Enumeration enum = root.enumerateNode();
+        while(enum.hasMoreElements()) {
+            XMLNode node = (XMLNode)enum.nextElement();
+            add("", node);
+        }
+    }
+    
+    public void add(String level, XMLNode node) {
+        if( node.getValue() != null ) {
+            setProperty( level+node.getName(), node.getValue());
+        }
+        Enumeration attrs = node.enumerateAttr();
+        if(attrs != null) {
+            while(attrs.hasMoreElements()) {
+                String attr = (String)attrs.nextElement();
+                setProperty( level+node.getName()+"."+attr, node.getAttr(attr));
+            }
+        }
+        Enumeration nodes = node.enumerateNode();
+        if(nodes != null) {
+            while(nodes.hasMoreElements()) {
+                XMLNode subnode = (XMLNode)nodes.nextElement();
+                add(level+subnode.getName()+".", subnode);
+            }
+        }
+    }
+    
+    public Object setProperty(String key, String value) {
+        return put( key, value );
+    }
+ 
+    // has to make sure not to write out any defaults
+    public void save(OutputStream outstrm, String header) {
+        super.save(outstrm,header);
+    }
+    // has to make sure not to write out any defaults
+    public void store(OutputStream outstrm, String header) throws IOException {
+        super.store(outstrm,header);
+    }
+}
diff --git a/genjava/project.properties b/genjava/project.properties
new file mode 100644
index 00000000..56a44b4c
--- /dev/null
+++ b/genjava/project.properties
@@ -0,0 +1,11 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
diff --git a/genjava/project.xml b/genjava/project.xml
new file mode 100644
index 00000000..52f5296f
--- /dev/null
+++ b/genjava/project.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project>
+  <pomVersion>3</pomVersion>
+  <id>genjava</id>
+  <name>GenJava Master Maven POM</name>
+  <currentVersion>1.0</currentVersion>
+
+  <organization>
+    <name>OSJava</name>
+    <url>http://www.osjava.org/</url>
+    <logo>/images/osjava.gif</logo>
+  </organization>
+  <inceptionYear>2000</inceptionYear>
+  <package>com.generationjava</package>
+  <logo>/images/1x1.gif</logo>
+
+  <url>http://www.osjava.org/genjava-core/${pom.id}/</url>
+  <issueTrackingUrl>http://www.osjava.org:8080/jira/secure/BrowseProject.jspa?id=10010</issueTrackingUrl>
+  <siteAddress>www.osjava.org/genjava-core</siteAddress>
+  <siteDirectory>/sites/org/osjava/www/releases/official/genjava-core/${pom.id}/</siteDirectory>
+  <distributionDirectory>/sites/org/osjava/www/releases/official/genjava-core/${pom.id}/</distributionDirectory>
+
+  <!-- Complains of more than 6 elements
+  <repository>
+    <connection>scm:cvs:ext:hen@orinoco.flamefew.net:/var/cvs:genjava-core/${pom.id}/</connection>
+    <url>http://www.generationjava.com/view-cvs/viewcvs.cgi/genjava-core/${pom.id}/</url>
+  </repository>
+  -->
+  
+  <mailingLists>
+    <mailingList>
+      <name>osjava-users</name>
+      <subscribe>http://lists.flamefew.net/mailman/listinfo/osjava-users</subscribe>
+      <unsubscribe>http://lists.flamefew.net/mailman/listinfo/osjava-users</unsubscribe>
+      <archive>http://lists.flamefew.net/mailman/private/osjava-users/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Henri Yandell</name>
+      <id>hen</id>
+      <email>bayard@generationjava.com</email>
+      <organization>GenerationJava</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+  </developers>
+
+  <contributors>
+    <contributor>
+      <name>Steve Heath</name>
+      <email>steve@smallcogs.com</email>
+    </contributor>
+  </contributors>
+    
+  <build>
+    <nagEmailAddress>bayard@www.generationjava.com</nagEmailAddress>
+    <sourceDirectory>src/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+    <!-- Unit test classes -->
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+    </unitTest>
+
+    <resources>
+      <includes>
+        <include>**/*.properties</include>
+      </includes>
+    </resources>
+    
+    <jars></jars>
+  </build>
+
+</project>
diff --git a/genjava/xdocs/navigation.xml b/genjava/xdocs/navigation.xml
new file mode 100644
index 00000000..d2e38e4b
--- /dev/null
+++ b/genjava/xdocs/navigation.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="genjava-core">
+
+  <title>genjava-core</title>
+
+  <body>
+    <menu name="Projects">
+      <item href="multiproject/core/" name="core"/>
+      <item href="multiproject/csv/" name="csv"/>
+      <item href="multiproject/scrape/" name="scrape"/>
+      <item href="multiproject/tools/" name="tools"/>
+      <item href="multiproject/xml/" name="xml"/>
+    </menu>
+  </body>
+</project>
diff --git a/hibernate-taglib/META-INF/taglib.tld b/hibernate-taglib/META-INF/taglib.tld
new file mode 100644
index 00000000..e8e4ce65
--- /dev/null
+++ b/hibernate-taglib/META-INF/taglib.tld
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<taglib>
+  <tlibversion>1.0</tlibversion>
+  <jspversion>1.1</jspversion>
+  <shortname>hibernate</shortname>
+  <uri>http://www.osjava.org/taglibs/hibernate-1.0</uri>
+  <info>Hibernate in a taglib. </info>
+  <tag>
+    <name>find</name>
+    <tagclass>org.osjava.hibernate.taglib.FindTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>param</name>
+    <tagclass>org.osjava.hibernate.taglib.ParamTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>value</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>type</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+</taglib>
diff --git a/hibernate-taglib/org/osjava/hibernate/taglib/FindTag.java b/hibernate-taglib/org/osjava/hibernate/taglib/FindTag.java
new file mode 100644
index 00000000..847d07e4
--- /dev/null
+++ b/hibernate-taglib/org/osjava/hibernate/taglib/FindTag.java
@@ -0,0 +1,129 @@
+package org.osjava.hibernate.taglib;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import net.sf.hibernate.SessionFactory;
+import net.sf.hibernate.Session;
+import net.sf.hibernate.cfg.Configuration;
+import net.sf.hibernate.HibernateException;
+import net.sf.hibernate.Hibernate;
+import net.sf.hibernate.type.Type;
+
+// Make this need a DataSource
+public class FindTag extends BodyTagSupport {
+
+    private String var;
+    private String expected;
+
+    private List types = new ArrayList();
+    private List parameters = new ArrayList();
+
+    public FindTag() {
+    }
+
+    public String getVar() { return this.var; }
+    public void setVar(String var) { this.var = var; }
+
+    public String getExpected() { return this.expected; }
+    public void setExpected(String expected) { this.expected = expected; }
+
+// move to doStart?
+    public int doEndTag() throws JspException {
+        if(bodyContent == null) {
+            return EVAL_PAGE;
+        }
+
+        String query = JspUtils.getBody(bodyContent);
+        System.out.println("QUERY: "+query);
+        Session hSession = null;
+        try {
+            SessionFactory hSf = new Configuration().configure().buildSessionFactory();
+            hSession = hSf.openSession();
+            List categories = null;
+            if(this.types.size() == 0 &&
+               this.parameters.size() == 0)
+            {
+                categories = hSession.find(query);
+            } else {
+                categories = hSession.find(
+                    query, 
+                    convertToHibernateValueArray(this.parameters, this.types),
+                    convertToHibernateArray(this.types)
+                );
+            }
+            if("one".equals(expected)) {
+                if(categories.size() == 1) {
+                    pageContext.setAttribute(this.var, categories.get(1));
+                } else {
+                    throw new JspTagException("Only one value was expected. ");
+                }
+            } else {
+                pageContext.setAttribute(this.var, categories);
+            }
+        } catch(HibernateException he) {
+            he.printStackTrace();
+        } finally {
+            this.types.clear();
+            this.parameters.clear();
+            if(hSession != null) {
+                try {
+                    hSession.close();
+                } catch(HibernateException he) {
+                    // ignore
+                }
+            }
+        }
+
+        return EVAL_PAGE;
+    }
+
+    // convert a list of hibernate strings to the parameters...
+    // bit lame, but it works...
+    // I think this will become a String-based API to Hibernate
+    private Type[] convertToHibernateArray(List types) {
+        ArrayList list2 = new ArrayList();
+        Iterator itr = types.iterator();
+        while(itr.hasNext()) {
+            String parameter = itr.next().toString();
+            if("Hibernate.LONG".equals(parameter)) {
+                list2.add(Hibernate.LONG);
+            }
+        }
+        System.err.println("L2: "+list2);
+        return (Type[]) list2.toArray(new Type[0]);
+    }
+
+    private Object[] convertToHibernateValueArray(List values, List types) {
+        ArrayList list2 = new ArrayList();
+        for(int i=0; i<types.size(); i++) {
+            String parameter = types.get(i).toString();
+            String value = values.get(i).toString();
+            if("Hibernate.LONG".equals(parameter)) {
+                list2.add( Long.valueOf(value) );
+            }
+        }
+        System.err.println("L2: "+list2);
+        return list2.toArray();
+    }
+
+    public void addType(String type) {
+        this.types.add(type);
+        System.out.println(""+this.types);
+    }
+
+    public void addParameter(String parameter) {
+        this.parameters.add(parameter);
+        System.out.println(""+this.parameters);
+    }
+
+}
diff --git a/hibernate-taglib/org/osjava/hibernate/taglib/JspUtils.java b/hibernate-taglib/org/osjava/hibernate/taglib/JspUtils.java
new file mode 100644
index 00000000..10b34494
--- /dev/null
+++ b/hibernate-taglib/org/osjava/hibernate/taglib/JspUtils.java
@@ -0,0 +1,24 @@
+package org.osjava.hibernate.taglib;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.jsp.tagext.BodyContent;
+
+class JspUtils {
+    
+    public static String getBody(BodyContent bodyContent) {
+        String text = null;
+        if(bodyContent != null) {
+            StringWriter body = new StringWriter();
+            try {
+                bodyContent.writeOut(body);
+                text = body.toString().trim();
+            } catch(IOException ioe) {
+                // ignore, return null is the error
+            }
+        }
+        return text;
+    }
+
+}
diff --git a/hibernate-taglib/org/osjava/hibernate/taglib/ParamTag.java b/hibernate-taglib/org/osjava/hibernate/taglib/ParamTag.java
new file mode 100644
index 00000000..0bf104e8
--- /dev/null
+++ b/hibernate-taglib/org/osjava/hibernate/taglib/ParamTag.java
@@ -0,0 +1,58 @@
+package org.osjava.hibernate.taglib;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import java.util.List;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.BodyTagSupport;
+
+import net.sf.hibernate.SessionFactory;
+import net.sf.hibernate.Session;
+import net.sf.hibernate.cfg.Configuration;
+import net.sf.hibernate.HibernateException;
+
+public class ParamTag extends BodyTagSupport {
+
+    private String value;
+    private String type;
+
+    public ParamTag() {
+    }
+
+    public String getValue() { return this.value; }
+    public void setValue(String value) { this.value = value; }
+
+    public String getType() { return this.type; }
+    public void setType(String type) { this.type = type; }
+
+// move to doStart?
+    public int doEndTag() throws JspException {
+        FindTag parent = (FindTag) findAncestorWithClass(this, FindTag.class);
+
+        if(parent == null) {
+            throw new JspTagException("Param tag outside parent find tag. ");
+        }
+
+        String paramValue = null;
+        if(value != null) {
+            paramValue = value;
+        } else {
+            String query = JspUtils.getBody(bodyContent);
+            if(query.trim().length() == 0) {
+                paramValue = null;
+            } else {
+                paramValue = query;
+            }
+        }
+
+        parent.addParameter(paramValue);
+        parent.addType(this.type);
+
+        return EVAL_PAGE;
+    }
+
+}
diff --git a/hibernate-taglib/runc.sh b/hibernate-taglib/runc.sh
new file mode 100755
index 00000000..55456f65
--- /dev/null
+++ b/hibernate-taglib/runc.sh
@@ -0,0 +1,2 @@
+javac -classpath .:servlet-api.jar:hibernate2.jar:jsp-api.jar org/osjava/hibernate/taglib/*.java 
+jar cf hibernate-taglib.jar org/osjava/hibernate/taglib/*.class META-INF/taglib.tld
diff --git a/oscube/project.properties b/oscube/project.properties
new file mode 100644
index 00000000..33598cbc
--- /dev/null
+++ b/oscube/project.properties
@@ -0,0 +1,12 @@
+maven.repo.remote=http://www.osjava.org/maven/,http://www.ibiblio.org/maven/
+
+maven.ui.navcol.background=#f4f8d8
+maven.ui.banner.background=#000066
+maven.ui.section.background=#000066
+maven.ui.subsection.background=#000066
+maven.ui.breadcrumbs.background=#f4f8d8
+
+maven.xdoc.poweredby.image=maven-feather.png
+maven.xdoc.includeProjectDocumentation=false
+maven.xdoc.date = left
+maven.xdoc.version = v${pom.currentVersion}
diff --git a/oscube/project.xml b/oscube/project.xml
new file mode 100644
index 00000000..9e5ed255
--- /dev/null
+++ b/oscube/project.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0"?>
+<project>
+  
+  <pomVersion>3</pomVersion>
+  <id>oscube</id>
+  <name>oscube</name>
+  <currentVersion>0.1</currentVersion>
+  <organization>
+    <name>OSJava</name>
+    <url>http://www.osjava.org/</url>
+    <logo>http://www.osjava.org/images/osjava.gif</logo>
+  </organization>
+  <inceptionYear>2003</inceptionYear>
+  <package>org.osjava.oscube</package>
+  <logo>http://www.osjava.org/images/1x1.gif</logo>
+  
+  <description>
+      A container engine.
+  </description>
+  
+  <shortDescription>A container engine</shortDescription>
+
+  <url>http://www.osjava.org/oscube/</url>
+  <issueTrackingUrl>http://www.osjava.org:8080/jira/secure/BrowseProject.jspa?id=10021</issueTrackingUrl>
+  <siteAddress>www.generationjava.com/maven/oscube</siteAddress>
+  <siteDirectory>/sites/org/osjava/www/maven/oscube/</siteDirectory>
+  <distributionDirectory>/sites/org/osjava/www/releases/official/</distributionDirectory>
+
+  <repository>
+    <connection>scm:cvs:pserver:anonymous@cvs.osjava.org:/var/cvs:oscube</connection>
+    <url>http://www.osjava.org/view-cvs/viewcvs.cgi/oscube/</url>
+  </repository>
+
+  <mailingLists>
+    <mailingList>
+      <name>osjava-users</name>
+      <subscribe>http://lists.flamefew.net/mailman/listinfo/osjava-users</subscribe>
+      <unsubscribe>http://lists.flamefew.net/mailman/listinfo/osjava-users</unsubscribe>
+      <archive>http://lists.flamefew.net/mailman/private/osjava-users/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+
+    <developer>
+      <name>Henri Yandell</name>
+      <id>hen</id>
+      <email>bayard@generationjava.com</email>
+      <organization>GenerationJava</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+  </developers>
+
+  
+  <dependencies>
+    <dependency>
+      <id>log4j</id>
+      <version>1.2.7</version>
+      <url>http://jakarta.apache.org/log4j/</url>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/</url>
+    </dependency>
+    <dependency>
+      <id>commons-dbutils</id>
+      <version>SNAPSHOT</version>
+      <url>http://jakarta.apache.org/commons/</url>
+    </dependency>
+    <dependency>
+      <groupId>genjava</groupId>
+      <artifactId>gj-core</artifactId>
+      <version>3.0</version>
+      <url>http://www.generationjava.com/</url>
+    </dependency>
+    <dependency>
+      <id>simple-jndi</id>
+      <version>0.7</version>
+      <url>http://www.generationjava.com/</url>
+    </dependency>
+    <dependency>
+      <id>quartz</id>
+      <version>1.0.7</version>
+      <url>http://www.part.net/quartz.html</url>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <nagEmailAddress>bayard@www.generationjava.com</nagEmailAddress>
+
+    <sourceDirectory>src/java</sourceDirectory>
+
+    <!--
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+    <unitTest>
+      <includes>
+        <include>**/*Test.java</include>
+      </includes>
+    </unitTest>
+    -->
+
+  </build>
+  <reports>
+        <report>maven-jxr-plugin</report>
+        <report>maven-javadoc-plugin</report>
+        <report>maven-license-plugin</report>
+        <report>maven-changes-plugin</report>
+        <report>maven-statcvs-plugin</report>
+        <report>maven-changelog-plugin</report>
+  </reports>
+</project>
+
diff --git a/oscube/src/java/org/osjava/oscube/container/AbstractConfig.java b/oscube/src/java/org/osjava/oscube/container/AbstractConfig.java
new file mode 100644
index 00000000..546fcda0
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/AbstractConfig.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scraping-Engine 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 org.osjava.oscube.container;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang.NumberUtils;
+import java.util.Date;
+
+public abstract class AbstractConfig implements Config {
+
+    private String context = "";
+
+    protected abstract Object getValue(String key);
+
+    public Object get(String key) {
+        return getValue( getContext()+key );
+    }
+
+    public boolean has(String key) {
+        return (get(key) != null);
+    }
+
+    public Object getAbsolute(String key) {
+        return getValue(key);
+    }
+
+    public String getString(String key) {
+        return (String)get(key);
+    }
+
+    public Date getDate(String key) {
+        try {
+            return java.text.DateFormat.getDateInstance(java.text.DateFormat.SHORT).parse(key);
+        } catch(java.text.ParseException pe) {
+            return null;
+        }
+    }
+
+    // rely on simple-jndi's type
+    public int getInt(String key) {
+        return NumberUtils.stringToInt(getString(key));
+    }
+
+    public List getList(String key) {
+        Object obj = get(key);
+        if(!(obj instanceof List)) {
+            List list = new ArrayList(1);
+            list.add(obj);
+            obj = list;
+        }
+        return (List)obj;
+    }
+
+    public void setContext(String context) {
+        this.context = context;
+    }
+
+    public String getContext() {
+        return this.context;
+    }
+
+    public Config cloneConfig() {
+        try {
+            return (Config)this.clone();
+        } catch(CloneNotSupportedException cnse) {
+            // ignore
+            throw new RuntimeException("Cloning of a Config failed. This should be impossible. ");
+        }
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Config.java b/oscube/src/java/org/osjava/oscube/container/Config.java
new file mode 100644
index 00000000..ae393df2
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Config.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.List;
+import java.util.Date;
+
+public interface Config extends Cloneable {
+
+    public Object get(String key);
+    public boolean has(String key);
+    public Object getAbsolute(String key);
+    public String getString(String key);
+    public int getInt(String key);
+    public Date getDate(String key);
+    public List getList(String key);
+    public void setContext(String context);
+    public String getContext();
+    public Config cloneConfig();
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/ConfigFactory.java b/oscube/src/java/org/osjava/oscube/container/ConfigFactory.java
new file mode 100644
index 00000000..8461690c
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/ConfigFactory.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+public class ConfigFactory {
+
+    static public Config getConfig(String[] args) {
+        return new JndiConfig();
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Engine.java b/oscube/src/java/org/osjava/oscube/container/Engine.java
new file mode 100644
index 00000000..2c8b93d5
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Engine.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.List;
+import java.io.Reader;
+
+public class Engine {
+
+    public static void main(String[] args) throws Exception {
+        Engine engine = new Engine();
+        // load the config
+        Config cfg = ConfigFactory.getConfig(args);
+        String runStr = cfg.getString("org.osjava.oscube.runner");
+        Class cl = Class.forName(runStr);
+        Runner runner = (Runner) cl.newInstance();
+        engine.run(runner, args);
+    }
+
+/// TODO: Implement the Scheduler aspect
+///  The Scheduler notifies only this class. It is 
+///  then up to this Engine to run the parsers.
+/// TODO: Put the oscube.container and db in a different thread
+    public void run(Runner runner, String[] args) {
+        // load the config
+        Config cfg = ConfigFactory.getConfig(args);
+
+        // get the prefix for this instance, this is the active 
+        // object which will be run by the runner
+        String prefix = cfg.getString("org.osjava.oscube.prefix");
+
+        // test and how schedule=startup will be handled
+        List list = cfg.getList(prefix);
+        for(int i=0; i<list.size(); i++) {
+            String key = (String)list.get(i);
+
+            Session session = new NamespaceSession();
+            session.put(prefix, key);
+            cfg.setContext(key+".");
+
+//            String scheduler = cfg.getString("scheduler");
+
+            // schedule the times to run parsers
+            // TODO: allow this to be pluggable.
+            Scheduler scheduler = SchedulerFactory.getScheduler(cfg, session);
+            // Engine suddenly becomes a part of the system. 
+            // Possibly the run(Config, Session) needs to 
+            // move into an interface
+            scheduler.schedule(cfg, session, runner);
+
+            // temporary running
+            runner.run(cfg, session);
+        }
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Header.java b/oscube/src/java/org/osjava/oscube/container/Header.java
new file mode 100644
index 00000000..1520d697
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Header.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+public interface Header extends Comparable {
+
+    public Object getValue();
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/JndiConfig.java b/oscube/src/java/org/osjava/oscube/container/JndiConfig.java
new file mode 100644
index 00000000..200b76be
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/JndiConfig.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+public class JndiConfig extends AbstractConfig {
+
+    private static Logger logger = Logger.getLogger(JndiConfig.class);
+
+    private Context ctxt;
+
+    public JndiConfig() {
+        try {
+            this.ctxt = new InitialContext();
+        } catch(NamingException ne) {
+            // TODO: Log
+            logger.debug("Error creating context. ", ne);
+            throw new RuntimeException("Unable to make InitialContext. No JNDI. ");
+        }
+    }
+
+    protected Object getValue(String key) {
+        try {
+            return ctxt.lookup(key);
+        } catch(NamingException ne) {
+            logger.debug("JNDI failed to find: "+key);
+            return null;
+        }
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/MultiResult.java b/oscube/src/java/org/osjava/oscube/container/MultiResult.java
new file mode 100644
index 00000000..2f5f9f55
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/MultiResult.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+public class MultiResult implements Result {
+
+    private List list = new LinkedList();
+
+    public MultiResult() {
+    }
+
+    public void addResult(Result result) {
+        /// TODO: Might want to rethink this in case 
+        ///       results hide a lot of resource or something
+        this.list.add(result.iterateRows());
+    }
+
+    public Iterator iterateRows() {
+        return new MultiIterator(this.list);
+    }
+
+}
+
+class MultiIterator implements Iterator {
+
+    private List list;
+    private int current;
+    private int max;
+
+    public MultiIterator(List list) {
+        this.list = list;
+        this.max = list.size() - 1;
+    }
+
+    public boolean hasNext() {
+        boolean b = ((Iterator)list.get(this.current)).hasNext();
+        if(!b) {
+            if(this.current == max) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public Object next() {
+        return ((Iterator)list.get(this.current)).next();
+    }
+
+    public void remove() {
+        ((Iterator)list.get(this.current)).remove();
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/NamespaceSession.java b/oscube/src/java/org/osjava/oscube/container/NamespaceSession.java
new file mode 100644
index 00000000..652cc0a5
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/NamespaceSession.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.List;
+import com.generationjava.namespace.Namespace;
+import com.generationjava.namespace.SimpleNamespace;
+
+public class NamespaceSession extends AbstractConfig implements Session {
+
+    private Namespace namespace;
+
+    public NamespaceSession() {
+        this.namespace = new SimpleNamespace();
+    }
+
+    protected Object getValue(String key) {
+        return this.namespace.getValue(key);
+    }
+
+    public void put(String key, Object value) {
+        this.namespace.putValue(key, value);
+    }
+
+    // TODO: Move to AbstractSession
+    public Object remove(String key) {
+        Object obj = get(key);
+        this.namespace.putValue(key, null);
+        return obj;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/NullResult.java b/oscube/src/java/org/osjava/oscube/container/NullResult.java
new file mode 100644
index 00000000..afd5b3b8
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/NullResult.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.Iterator;
+import org.apache.commons.collections.IteratorUtils;
+
+public class NullResult implements Result {
+
+    public Iterator iterateRows() {
+        return IteratorUtils.EMPTY_ITERATOR;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/QuartzJob.java b/oscube/src/java/org/osjava/oscube/container/QuartzJob.java
new file mode 100644
index 00000000..83a5fc55
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/QuartzJob.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import org.quartz.JobDetail;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.Job;
+
+public class QuartzJob implements Job {
+
+    public QuartzJob() {
+    }
+
+    public void execute(JobExecutionContext jec) throws JobExecutionException {
+        Scheduler sch = new SimpleScheduler();
+        JobDetail jd = jec.getJobDetail();
+        JobDataMap map = jd.getJobDataMap();
+        Config cfg = (Config)map.get("cfg");
+        Session session = (Session)map.get("session");
+        Runner runner = (Runner)map.get("runner");
+        sch.schedule(cfg, session, runner);
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/QuartzScheduler.java b/oscube/src/java/org/osjava/oscube/container/QuartzScheduler.java
new file mode 100644
index 00000000..87f5e745
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/QuartzScheduler.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import org.apache.commons.lang.StringUtils;
+
+import java.util.Date;
+
+import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.JobDetail;
+import org.quartz.JobDataMap;
+import org.quartz.Job;
+//import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.CronTrigger;
+import org.quartz.SimpleTrigger;
+
+import java.text.ParseException;
+
+import org.apache.log4j.Logger;
+
+/// BEWARE: Name clash. Scheduler and org.quartz.Scheduler
+public class QuartzScheduler implements Scheduler {
+
+    private static Logger logger = Logger.getLogger(QuartzScheduler.class);
+
+    private org.quartz.Scheduler quartz;
+
+    public QuartzScheduler() {
+        try {
+            quartz = new StdSchedulerFactory().getScheduler();
+            quartz.start();
+        } catch(SchedulerException se) {
+            throw new RuntimeException("Failed to schedule job. " + se);
+        }
+    }
+
+    public void schedule(Config cfg, Session session, Runner runner) {
+        // TODO: Should this clone, or the driver of this?
+        cfg = cfg.cloneConfig();
+        String schedule = cfg.getString("schedule");
+
+        // set default
+        if(StringUtils.isEmpty(schedule)) {
+            schedule = "startup";
+        } 
+
+        logger.debug("SCHEDULE: "+schedule);
+
+        // this should be one of the following:
+        // a cron-like line or a 'startup' option 
+        if("startup".equalsIgnoreCase(schedule)) { 
+            Scheduler sch = new SimpleScheduler();
+            sch.schedule(cfg, session, runner);
+        } else {
+            // assume it's a cron statement
+            try {
+                String ctxt = cfg.getContext();
+                String jobName = ctxt+"job";
+                // TODO: Make this 'Scraper' or some such. Maybe 
+                // a name that links to the current engine's instance
+                // Engine: +engine.toString()
+                String jobgroup = ctxt+"group"; 
+                JobDetail detail = new JobDetail(jobName, jobgroup, QuartzJob.class);
+                JobDataMap map = detail.getJobDataMap();
+                map.put("cfg", cfg);
+                map.put("session", session);
+                map.put("runner", runner);
+
+                Trigger trigger = null;
+                if("cron".equalsIgnoreCase(schedule)) {
+                    String cronTxt = cfg.getString("schedule.cron");
+                    logger.debug("Creating cron trigger: "+cronTxt+" for "+ctxt);
+                    CronTrigger cron = new CronTrigger(ctxt+"crontrigger", jobgroup, jobName, jobgroup, cronTxt);
+                    trigger = cron;
+                } else {
+                    // TODO: ie) "simple" in this case. need to make this explicit
+//                    Date start = cfg.getDate("start");
+//                    Date end = cfg.getDate("end");
+                    int repeat = cfg.getInt("schedule.repeat");
+                    if(repeat == -1) {
+                        repeat = SimpleTrigger.REPEAT_INDEFINITELY;
+                    }
+                    int interval = cfg.getInt("schedule.interval");
+                    logger.debug("Creating simple trigger: "+interval+":"+repeat+" for "+ctxt);
+                    SimpleTrigger simp = new SimpleTrigger(ctxt+"simpletrigger", jobgroup, repeat, interval);
+                    trigger = simp;
+                }
+
+                quartz.scheduleJob(detail, trigger);
+            } catch(ParseException pe) {
+                throw new RuntimeException("Failed to parse cron. " + pe);
+            } catch(SchedulerException se) {
+                throw new RuntimeException("Failed to schedule job. " + se);
+            }
+        }
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Result.java b/oscube/src/java/org/osjava/oscube/container/Result.java
new file mode 100644
index 00000000..72dae6b4
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Result.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.Iterator;
+
+public interface Result {
+
+    public Iterator iterateRows();
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Runner.java b/oscube/src/java/org/osjava/oscube/container/Runner.java
new file mode 100644
index 00000000..f070cc04
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Runner.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+public interface Runner {
+
+    public void run(Config cfg, Session session);
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Scheduler.java b/oscube/src/java/org/osjava/oscube/container/Scheduler.java
new file mode 100644
index 00000000..c1e9e0e7
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Scheduler.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+public interface Scheduler {
+
+    public void schedule(Config cfg, Session session, Runner runner);
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/SchedulerFactory.java b/oscube/src/java/org/osjava/oscube/container/SchedulerFactory.java
new file mode 100644
index 00000000..7a4ef755
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/SchedulerFactory.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import org.osjava.oscube.util.FactoryUtils;
+import java.util.HashMap;
+
+public class SchedulerFactory {
+
+    static private HashMap cache = new HashMap();
+
+    static public Scheduler getScheduler(Config cfg, Session session) {
+        String name = cfg.getString("scheduler");
+        if(name == null) {
+            name = "Simple";
+        }
+        if(SchedulerFactory.cache.containsKey(name)) {
+            return (Scheduler)SchedulerFactory.cache.get(name);
+        }
+
+        Scheduler scheduler = (Scheduler)FactoryUtils.getObject(name, "Scheduler", "org.osjava.oscube.container");
+        if(scheduler == null) {
+            throw new RuntimeException("Unable to find Scheduler. ");
+        }
+        SchedulerFactory.cache.put(name, scheduler);
+        return scheduler;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/Session.java b/oscube/src/java/org/osjava/oscube/container/Session.java
new file mode 100644
index 00000000..ffb7203b
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/Session.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.List;
+
+public interface Session extends Config {
+
+    public Object get(String key);
+    public String getString(String key);
+    public List getList(String key);
+    public Object remove(String key);
+
+    public void put(String key, Object value);
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/SimpleScheduler.java b/oscube/src/java/org/osjava/oscube/container/SimpleScheduler.java
new file mode 100644
index 00000000..ede24471
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/SimpleScheduler.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import org.apache.commons.lang.StringUtils;
+
+public class SimpleScheduler implements Scheduler {
+
+    public void schedule(Config cfg, Session session, Runner runner) {
+        // push a thread off
+        runner.run(cfg.cloneConfig(), session);
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/SingleResult.java b/oscube/src/java/org/osjava/oscube/container/SingleResult.java
new file mode 100644
index 00000000..b7954755
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/SingleResult.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.Iterator;
+import java.util.ArrayList;
+
+// A Result class that makes that little bit simpler
+public class SingleResult implements Result {
+
+    private Object obj = null;
+
+    public SingleResult(Object obj) {
+        this.obj = obj;
+    }
+
+    // returns Iterator of <Object[]>.
+    public Iterator iterateRows() {
+        // use a better class later
+        ArrayList list = new ArrayList(1);
+        Object[] objs = new Object[] { obj };
+        list.add(objs);
+        return list.iterator();
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/container/TabularResult.java b/oscube/src/java/org/osjava/oscube/container/TabularResult.java
new file mode 100644
index 00000000..e07a6fbf
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/container/TabularResult.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.container;
+
+import java.util.Iterator;
+
+public class TabularResult implements Result {
+
+    private Iterator iterator;
+
+    public TabularResult(Iterator iterator) {
+        this.iterator = iterator;
+    }
+
+    // returns Iterator of <Object[]>.
+    // very simple system to start with 
+    // so our JdbcStore can be simple
+    public Iterator iterateRows() {
+        return this.iterator;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/notify/NotificationException.java b/oscube/src/java/org/osjava/oscube/service/notify/NotificationException.java
new file mode 100644
index 00000000..14b9ac0a
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/notify/NotificationException.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.notify;
+
+public class NotificationException extends org.apache.commons.lang.exception.NestableException {
+
+    public NotificationException(String msg) {
+        super(msg);
+    }
+
+    public NotificationException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/notify/NotificationFactory.java b/oscube/src/java/org/osjava/oscube/service/notify/NotificationFactory.java
new file mode 100644
index 00000000..005ad022
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/notify/NotificationFactory.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.notify;
+
+import org.osjava.oscube.util.FactoryUtils;
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Config;
+
+public class NotificationFactory {
+
+    static public Notifier getSuccessNotifier(Config cfg, Session session) {
+        String name = cfg.getString("notifier.success");
+        Notifier notifier = (Notifier)FactoryUtils.getObject(name, "Notifier", "org.osjava.oscube.service.notify");
+        if(notifier == null) {
+            throw new RuntimeException("Unable to find Success Notifier. ");
+        }
+        return notifier;
+    }
+
+    static public Notifier getErrorNotifier(Config cfg, Session session, Exception e) {
+        String name = cfg.getString("notifier.error."+e.getClass().getName());
+        if(name == null) {
+            name = cfg.getString("notifier.error");
+        }
+        Notifier notifier = (Notifier)FactoryUtils.getObject(name, "Notifier", "org.osjava.oscube.service.notify");
+        if(notifier == null) {
+            throw new RuntimeException("Unable to find Error Notifier. ");
+        }
+        return notifier;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/notify/Notifier.java b/oscube/src/java/org/osjava/oscube/service/notify/Notifier.java
new file mode 100644
index 00000000..00ccafa8
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/notify/Notifier.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.notify;
+
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Config;
+
+// can notify success and error. How to separate?
+// have a Formatter for formatting the thing? Opposite of a 
+// Converter really
+
+public interface Notifier {
+
+    public void notify(Config cfg, Session session) throws NotificationException;
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/notify/NullNotifier.java b/oscube/src/java/org/osjava/oscube/service/notify/NullNotifier.java
new file mode 100644
index 00000000..8329798a
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/notify/NullNotifier.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.notify;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+
+// so currently it's doing the job of a default notifier
+public class NullNotifier implements Notifier {
+
+    public void notify(Config cfg, Session session) {
+        Exception error = (Exception)session.get(cfg.getContext()+".error");
+        if(error != null) {
+            error.printStackTrace();
+        }
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/FileStore.java b/oscube/src/java/org/osjava/oscube/service/store/FileStore.java
new file mode 100644
index 00000000..b22d3987
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/FileStore.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.store;
+
+import java.util.Iterator;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import java.net.URL;
+
+import com.generationjava.io.StreamW;
+
+import org.apache.log4j.Logger;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Header;
+import org.osjava.oscube.container.Result;
+
+public class FileStore implements Store {
+
+    private static Logger logger = Logger.getLogger(FileStore.class);
+
+// FileStore assumes that the result contains a URL, InputStream, other?
+// Assumes only row(?)
+// TODO: If no saveAs, then it can handle multiple rows
+// TODO: Optional argument 'maintainExtension=true'. In which case the 
+//       saveAs does not need to mention the extension.
+    public void store(Result result, Config cfg, Session session) throws StoringException {
+        OutputStream out = null;
+        InputStream in = null;
+try {
+        String path = cfg.getString("file.path");
+        String saveAs = cfg.getString("file.saveAs");
+
+        File file = new File(path, saveAs);
+        FileOutputStream fos = new FileOutputStream(file);
+
+        Iterator iterator = result.iterateRows();
+        if(iterator.hasNext()) {
+            Object[] row = (Object[])iterator.next();
+            if(row.length == 0) {
+                logger.error("Empty row found. Skipping. ");
+                return;
+            }
+            in = open(row[0]);
+            if(in != null) {
+                StreamW.pushStream(in, fos);
+            }
+        }
+
+} catch(IOException ioe) {
+    throw new StoringException("File I/O Storing Error: "+ioe.getMessage(), ioe);
+} finally {
+        try { if(in != null) in.close(); } catch(IOException ioe) { } 
+        try { if(out != null) out.close(); } catch(IOException ioe) { } 
+}
+    }
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException {
+        // need to write some kind of checking in here
+        return false;
+    }
+
+    private InputStream open(Object obj) throws IOException {
+        if(obj instanceof URL) {
+            URL url = (URL) obj;
+            return url.openStream();
+        } else 
+        if(obj instanceof String) {
+            return new java.io.ByteArrayInputStream( ( (String) obj ).getBytes() );
+        } else 
+        if(obj instanceof InputStream) {
+            return (InputStream) obj;
+        } else 
+        if(obj instanceof File) {
+            return new java.io.FileInputStream( (File) obj);
+        } else
+        if(obj instanceof byte[]) {
+            return new java.io.ByteArrayInputStream( (byte[]) obj);
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/JdbcStore.java b/oscube/src/java/org/osjava/oscube/service/store/JdbcStore.java
new file mode 100644
index 00000000..26ac10e9
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/JdbcStore.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.store;
+
+import java.util.Iterator;
+import javax.sql.DataSource;
+import java.sql.*;
+import org.apache.commons.dbutils.DbUtils;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.log4j.Logger;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Header;
+import org.osjava.oscube.container.Result;
+
+public class JdbcStore implements Store {
+
+    private static Logger logger = Logger.getLogger(JdbcStore.class);
+
+    public void store(Result result, Config cfg, Session session) throws StoringException {
+        Connection conn = null;
+try {
+        // get DataSource from cfg
+        String dsname = cfg.getString("jdbc.DS");
+//        System.err.println("DSNAME: "+dsname);
+//        System.err.println("/DSNAME: "+cfg.getAbsolute(dsname));
+        DataSource ds = (DataSource)cfg.getAbsolute(dsname);
+//        System.err.println("DataSource: "+ds);
+        conn = ds.getConnection();
+//        System.err.println("CONN: "+conn);
+        String sql = cfg.getString("jdbc.sql");
+//        System.err.println("SQL: "+sql);
+        String table = cfg.getString("jdbc.table");
+//        System.err.println("Table: "+table);
+        if(sql == null) {
+            if(table == null) {
+                throw new StoringException(cfg.getContext()+".jdbc.sql or "+cfg.getContext()+".jdbc.table must be specified. ");
+            }
+        }
+
+        Iterator iterator = result.iterateRows();
+        while(iterator.hasNext()) {
+            Object[] row = (Object[])iterator.next();
+            if(row.length == 0) {
+                logger.error("Empty row found. Skipping. ");
+                continue;
+            }
+            if(sql == null) {
+                if(table != null) {  
+                    sql = "INSERT INTO " + table + " VALUES(?"+ StringUtils.repeat(", ?", row.length-1) + ")";
+                }
+            }
+            int count = DbUtils.executeUpdate( conn, sql, row );
+        }
+
+} catch(SQLException sqle) {
+    throw new StoringException("JDBC Storing Error: "+sqle.getMessage(), sqle);
+} finally {
+        DbUtils.closeQuietly( conn );
+}
+    }
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException {
+        // need to write some kind of checking in here
+        return false;
+    }
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/NullStore.java b/oscube/src/java/org/osjava/oscube/service/store/NullStore.java
new file mode 100644
index 00000000..df3ee651
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/NullStore.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.store;
+
+import java.util.Iterator;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Header;
+import org.osjava.oscube.container.Result;
+
+public class NullStore implements Store {
+
+    public void store(Result result, Config cfg, Session session) throws StoringException {
+        if(false) throw new StoringException(null,null);
+        Iterator iterator = result.iterateRows();
+        int i=0;
+        while(iterator.hasNext()) {
+            Object[] array = (Object[])iterator.next();
+            for(int j=0; j<array.length; j++) {
+                System.out.println("["+i+", "+j+"] = "+array[j]);
+            }
+            i++;
+        }
+    }
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException {
+        return false;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/PrinterStore.java b/oscube/src/java/org/osjava/oscube/service/store/PrinterStore.java
new file mode 100644
index 00000000..a251d443
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/PrinterStore.java
@@ -0,0 +1,39 @@
+package org.osjava.oscube.service.store;
+
+import java.util.Iterator;
+
+import com.generationjava.lang.StringW;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Header;
+import org.osjava.oscube.container.Result;
+
+public class PrinterStore implements Store {
+
+    public void store(Result result, Config cfg, Session session) throws StoringException {
+        if(false) throw new StoringException(null,null);
+        Iterator iterator = result.iterateRows();
+        while(iterator.hasNext()) {
+            Object row = iterator.next();
+            echo(row);
+        }
+    }
+
+    private void echo(Object obj) {
+        if(obj == null) {
+            System.out.println("NULL ROW");
+        } else
+        if(obj instanceof Object[]) {
+            Object[] objs = (Object[])obj;
+            System.out.println( StringW.join(objs, ", ", "{ ", " }") );
+        } else {
+            System.out.println(obj.toString());
+        }
+    }
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException {
+        return false;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/Store.java b/oscube/src/java/org/osjava/oscube/service/store/Store.java
new file mode 100644
index 00000000..fa0f2480
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/Store.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.store;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+import org.osjava.oscube.container.Header;
+import org.osjava.oscube.container.Result;
+
+public interface Store {
+
+    /**
+     * Place the Result in a store of some kind. 
+     * This store does not have to be persistent, it could 
+     * be memory-based or the screen. 
+     */
+    public void store(Result result, Config cfg, Session session) throws StoringException;
+
+    /**
+     * Does this Header for a possible Result exist already?
+     * This is designed to try and stop parsing of stuff 
+     * already parsed, though it's not implemented yet. 
+     */
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException;
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/StoreFactory.java b/oscube/src/java/org/osjava/oscube/service/store/StoreFactory.java
new file mode 100644
index 00000000..1de96728
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/StoreFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.store;
+
+import org.osjava.oscube.util.FactoryUtils;
+
+import org.osjava.oscube.container.Config;
+import org.osjava.oscube.container.Session;
+
+public class StoreFactory {
+
+    static public Store getStore(Config cfg, Session session) {
+        String name = cfg.getString("store");
+        Store store = (Store)FactoryUtils.getObject(name, "Store", "org.osjava.oscube.service.store");
+        if(store == null) {
+            throw new RuntimeException("Unable to find Store. ");
+        }
+        return store;
+    }
+
+}
diff --git a/oscube/src/java/org/osjava/oscube/service/store/StoringException.java b/oscube/src/java/org/osjava/oscube/service/store/StoringException.java
new file mode 100644
index 00000000..f5d6c5c2
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/service/store/StoringException.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.service.store;
+
+public class StoringException extends org.apache.commons.lang.exception.NestableException {
+
+    public StoringException(String msg) {
+        super(msg);
+    }
+
+    public StoringException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}
diff --git a/oscube/src/java/org/osjava/oscube/util/FactoryUtils.java b/oscube/src/java/org/osjava/oscube/util/FactoryUtils.java
new file mode 100644
index 00000000..efc1cf67
--- /dev/null
+++ b/oscube/src/java/org/osjava/oscube/util/FactoryUtils.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2003, Henri Yandell
+ * 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 Scabies 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 org.osjava.oscube.util;
+
+import com.generationjava.lang.ClassW;
+
+public class FactoryUtils {
+
+    static private String NULL_NAME = "Null";
+
+    static public Object getObject(String name, String type, String defaultPackage) {
+        if(name != null) {
+            Object obj = ClassW.createObject(defaultPackage+"."+name+type);
+            // should it check the type? it assumes we have a 
+            // clue what the interface is...
+            if(obj != null) {
+                return obj;
+            }
+            obj = ClassW.createObject(name+type);
+            if(obj != null) {
+                return obj;
+            }
+            obj = ClassW.createObject(name);
+            if(obj != null) {
+                return obj;
+            }
+        }
+        if(name == NULL_NAME) {
+            // if it couldn't find the Null pattern for the type
+            return null;
+        } else {
+            return getObject(NULL_NAME, type, defaultPackage);
+        }
+    }
+
+}
diff --git a/payload/src/java/META-INF/Payload.mf b/payload/src/java/META-INF/Payload.mf
new file mode 100644
index 00000000..22e0700f
--- /dev/null
+++ b/payload/src/java/META-INF/Payload.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.generationjava.payload.PayloadExtractor
+Created-By: 1.3.0 (Apple Computer, Inc.)
diff --git a/payload/src/java/com/generationjava/payload/PayloadExtractor.java b/payload/src/java/com/generationjava/payload/PayloadExtractor.java
new file mode 100644
index 00000000..20619c94
--- /dev/null
+++ b/payload/src/java/com/generationjava/payload/PayloadExtractor.java
@@ -0,0 +1,131 @@
+package com.generationjava.payload;
+
+import java.util.jar.*;
+
+import java.util.*;
+
+import java.io.*;
+
+public class PayloadExtractor {
+
+    public static void main(String[] args) {
+        System.out.print("Payload extraction setup");
+
+        // when run with -jar, the class path is the jar file
+        String jarFile = System.getProperty("java.class.path");
+        if(jarFile.indexOf(":") != -1) {
+            jarFile = null;
+            // get the jarFile as a -j argument
+        }
+        String jarName = jarFile.substring( 0, jarFile.length() - 4 );
+        System.out.print(".");
+
+        // TODO: check arguments. There can be a -d to specify target dir
+        System.out.print(".");
+
+        Properties props = null;
+        if(args.length == 0) {
+            System.err.println("\nNo properties file specified, will output without interpolation. ");
+        } else {
+            FileInputStream fin = null;
+            try {
+                fin = new FileInputStream(new File(args[0]));
+                props = new Properties();
+                props.load(fin);
+            } catch(IOException ioe) {
+                System.err.println("\nUnable to find properties file, will output without interpolation. ");
+            } finally {
+                if(fin != null) {
+                    try {
+                        fin.close();
+                    } catch(IOException ioe) {
+                        // ignore
+                    }
+                }
+            }
+        }
+        System.out.println(".");
+
+        System.out.print("Payload extracting");
+        // loop....
+        try {
+            JarFile jar = new JarFile(new File(jarFile));
+            Enumeration enum = jar.entries();
+            while(enum.hasMoreElements()) {
+                JarEntry entry = (JarEntry) enum.nextElement();
+                if(!entry.getName().startsWith("payload")) {
+                    continue;
+                }
+                // remove payload/
+                String inName = entry.getName().substring(8);
+                String outName = jarName + File.separator + inName;
+                File outFile = new File(outName);
+                if(entry.isDirectory()) {
+                    outFile.mkdirs();
+                    continue;
+                } else {
+                    outFile.getParentFile().mkdirs();
+                }
+
+                InputStream in = jar.getInputStream( entry );
+
+                // TODO: configurable interpolation targets
+                // trusting that we're not interpolating anything 
+                // that can't fit in memory
+                if( props != null && interpolatable(outName)) {
+                    // interpolate push
+                    String text = readToString(in);
+                    text = interpolate(text, props);
+                    in.close();
+                    in = new ByteArrayInputStream(text.getBytes());
+                }
+
+                OutputStream out = new FileOutputStream( outFile );
+                pushBytes(in, out);
+                out.close();
+                in.close();
+                System.out.print(".");
+            }
+        } catch(IOException ioe) { ioe.printStackTrace(); }
+
+
+        System.out.println("");
+        System.out.println("Payload has arrived. ");
+    }
+
+    private static boolean interpolatable(String name) {
+        return name.endsWith(".xml") || name.endsWith(".txt");
+    }
+
+    // util methods from here down
+    private static void pushBytes(InputStream in, OutputStream out) throws IOException {
+        byte[] buffer = new byte[1023];
+        while(true) {
+            int size = in.read(buffer);
+            if(size == -1) {
+                break;
+            }
+            out.write(buffer,0,size);
+        }
+    }
+
+    private static String readToString(InputStream in) throws IOException {
+        BufferedReader rdr = new BufferedReader(new InputStreamReader(in));
+        StringBuffer buffer = new StringBuffer();
+        String line = "";
+        while( (line = rdr.readLine()) != null) {
+            buffer.append(line);
+        }
+        return buffer.toString();
+    }
+
+    private static String interpolate(String str, Properties props) {
+        Iterator itr = props.keySet().iterator();
+        while(itr.hasNext()) {
+            String key = (String) itr.next();
+            // switch away from regexp with Lang's replace method?
+            str = str.replaceAll( "\\$\\{"+key+"\\}", props.getProperty(key) );
+        }
+        return str;
+    }
+}
diff --git a/payload/xdocs/design.txt b/payload/xdocs/design.txt
new file mode 100644
index 00000000..cc215c1e
--- /dev/null
+++ b/payload/xdocs/design.txt
@@ -0,0 +1,14 @@
+Payload is an bash/ant/jelly script that takes a 'technology' tree and a 
+build tree and merges them together to create an executable jar that contains 
+the merged tree. It includes PayloadExtractor, which deploys the payload and 
+performs search and replace using a supplied properties file.
+
+For optimisation, PayloadExtractor can know the files it should search 
+and replace on.
+
+A payload'd jar looks like:
+
+META-INF/MANIFEST.MF
+com/generationjava/payload/PayloadExtractor.class
+payload/<payload>
+interpolate.properties
diff --git a/pergamum/Style.java b/pergamum/Style.java
new file mode 100644
index 00000000..55bce875
--- /dev/null
+++ b/pergamum/Style.java
@@ -0,0 +1,41 @@
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import org.xml.sax.SAXException;
+import org.w3c.dom.*;
+
+public class Style {
+
+    public static void main(String[] args) {
+        try {
+            run(args);
+        } catch(Throwable t) {
+            t.printStackTrace();
+        }
+    }
+    public static void run(String[] args) throws TransformerException, TransformerConfigurationException, FileNotFoundException, IOException, ParserConfigurationException, SAXException {  
+        if(args.length != 2) {
+            throw new IllegalArgumentException("Must be 2 arguments, book xml and page xsl ");
+        }
+
+        // Generate the book pages
+        TransformerFactory tFactory = TransformerFactory.newInstance();
+        Transformer transformer = tFactory.newTransformer(new StreamSource(args[1]));
+        // Use this in filename
+        String name = "docs/"+args[0].substring(0, args[0].length()-4)+".html";
+
+        transformer.transform(new StreamSource(args[0]), new StreamResult(new FileOutputStream(name)));
+        System.out.println(". "+name);
+    }
+}
diff --git a/pergamum/db/books.xml b/pergamum/db/books.xml
new file mode 100644
index 00000000..5cd66e94
--- /dev/null
+++ b/pergamum/db/books.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<category name="Open Source Java Books">
+  <subcategory name="Apache Struts">
+    <book isbn="0596003285" name="Programming Jakarta Struts" publisher="ora" url="YY"/>
+    <book isbn="0596005199" name="Jakarta Struts Pocket Reference" publisher="ora" url="YY"/>
+    <book isbn="0672324725" name="Struts: Kick Start" publisher="sam" url="YY"/>
+    <book isbn="1558608621" name="The Struts Framework: Practical Guide for Java Programmers" publisher="mk" url="YY"/>
+    <book isbn="1930110502" name="Struts in Action" publisher="man" url="YY"/>
+    <book isbn="0764544373" name="Professional Jakarta Struts" publisher="wrx" url="YY"/>
+    <book isbn="0974848808" name="Struts Survival Guide: Basics to Best Practices" publisher="obj" url="YY"/>
+    <book isbn="0471213020" name="Mastering Jakarta Struts" publisher="wil" url="YY"/>
+  </subcategory>
+  <subcategory name="Apache Jakarta Tapestry">
+    <book isbn="1932394117" name="Tapestry in Action" publisher="man" url="YY"/>
+  </subcategory>
+  <subcategory name="Apache Ant">
+    <book isbn="1930110588" name="Java Development with Ant" publisher="man" url="YY"/>
+    <book isbn="0672324261" name="Ant Developer's Handbook" publisher="sam" url="YY"/>
+    <book isbn="1584502487" name="Ant: The Java Build Tool in Practice" publisher="chr" url="YY"/>
+    <book isbn="0596001843" name="Ant: The Definitive Guide" publisher="ora" url="YY"/>
+    <book isbn="0672325624" name="Extreme Programming with Ant" publisher="sam" url="YY"/>
+  </subcategory>
+  <subcategory name="Apache Jakarta General">
+    <book isbn="0471449156" name="Jakarta Pitfalls" publisher="wil" url="YY"/>
+  </subcategory>
+  <subcategory name="Apache Jakarta Commons">
+    <book isbn="1590592832" name="Pro Jakarta Commons" publisher="apr" url="YY"/>
+    <book isbn="1584502460" name="Applied Software Engineering Using Apache Jakarta Commons" publisher="chr" url="YY"/>
+  </subcategory>
+  <subcategory name="Apache Jakarta Tomcat">
+    <book isbn="0764543725" name="Professional Apache Tomcat" publisher="wrx" url="YY"/>
+    <book isbn="0596003188" name="Tomcat: The Definitive Guide" publisher="ora" url="YY"/>
+    <book isbn="0764526065" name="Apache Tomcat Bible" publisher="wil" url="YY"/>
+    <book isbn="0471237647" name="Mastering Tomcat Development" publisher="wil" url="YY"/>
+    <book isbn="1861008309" name="Apache Tomcat Security Handbook" publisher="wrx" url="YY"/>
+  </subcategory>
+  <subcategory name="JUnit">
+    <book isbn="1930110995" name="JUnit in Action" publisher="man" url="YY"/>
+    <book isbn="0596005822" name="JUnit: The Definitive Guide" publisher="ora" url="YY"/>
+  </subcategory>
+  <subcategory name="XDoclet">
+    <book isbn="1932394052" name="XDoclet in Action" publisher="man" url="YY"/>
+  </subcategory>
+  <subcategory name="General">
+    <book isbn="0471463620" name="Java Open Source Programming" publisher="wil" url="YY"/>
+    <book isbn="0471444359" name="J2EE Open Source Toolkit" publisher="wil" url="YY"/>
+    <book isbn="047120708X" name="Java Tools for eXtreme Programming" publisher="wil" url="YY"/>
+    <book isbn="0596003870" name="Java Extreme Programming Cookbook" publisher="ora" url="YY"/>
+    <book isbn="1932394192" name="Explorer's Guide to Open Source Java Tools" publisher="man" url="YY"/>
+    <book isbn="1932394060" name="Art of Java Web Development" publisher="man" url="YY"/>
+  </subcategory>
+  <subcategory name="Eclipse">
+    <book isbn="1930110960" name="Eclipse in Action: A Guide for the Java Developer" publisher="man" url="YY"/>
+    <book isbn="0321159640" name="Java Developer's Guide to Eclipse" publisher="aw" url="YY"/>
+    <book isbn="0131425420" name="Eclipse Modeling Framework" publisher="aw" url="YY"/>
+    <book isbn="0321205758" name="Contributing to Eclipse: Principles, Patterns, and Plugins" publisher="aw" url="YY"/>
+    <book isbn="1583470441" name="Eclipse: Step by Step" publisher="mc" url="YY"/>
+  </subcategory>
+  <subcategory name="Hibernate">
+    <book isbn="193239415X" name="Hibernate in Action" publisher="man" url="YY"/>
+  </subcategory>
+  <subcategory name="JBoss">
+    <book isbn="1590592816" name="JBoss 3.2 Deployment and Administration" publisher="apr" url="YY"/>
+    <book isbn="0672323478" name="JBoss Administration and Development" publisher="sam" url="YY"/>
+    <book isbn="013112594X" name="Core JBoss 3.X: J2EE Application Development and Deployment" publisher="ptr" url="YY"/>
+    <book isbn="1590593340" name="The Definitive Guide to JBoss 4" publisher="apr" url="YY"/>
+    <book isbn="0596004079" name="Using JBoss" publisher="ora" url="YY"/>
+  </subcategory>
+</category>
diff --git a/pergamum/db/publishers.xml b/pergamum/db/publishers.xml
new file mode 100644
index 00000000..57100ffc
--- /dev/null
+++ b/pergamum/db/publishers.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<publishers>
+ <publisher id="ora" name="O'Reilly" url="http://www.oreilly.com/"/>
+ <publisher id="apr" name="Apress" url="http://www.apress.com/"/>
+ <publisher id="man" name="Manning" url="http://www.manning.com/"/>
+ <publisher id="mk" name="Morgan-Kaufmann" url="http://www.mkp.com/"/>
+ <publisher id="wil" name="Wiley" url="http://www.wiley.com/"/>
+ <publisher id="sam" name="Sams" url="http://www.sams.com/"/>
+ <publisher id="obj" name="ObjectSource" url="http://www.objectsource.com/"/>
+ <publisher id="wrx" name="Wrox" url="http://www.wrox.com/"/>
+ <publisher id="chr" name="Charles River" url="http://www.charlesriver.com/"/>
+ <publisher id="aw" name="Addison-Wesley" url="http://www.addisonwesley.com/"/>
+ <publisher id="mc" name="MC Press" url="http://www.mcpressonline.com/"/>
+ <publisher id="ptr" name="Prentice Hall" url="http://www.prenticehall.com/"/>
+</publishers>
diff --git a/pergamum/docs/books.html b/pergamum/docs/books.html
new file mode 100644
index 00000000..2ee47d30
--- /dev/null
+++ b/pergamum/docs/books.html
@@ -0,0 +1,406 @@
+<html>
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Open Source Java Books</title>
+</head>
+<body>
+<h2>Open Source Java Books</h2>
+  
+<h3>Apache Struts</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Programming Jakarta Struts</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596003285">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596003285">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Jakarta Struts Pocket Reference</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596005199">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596005199">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Struts: Kick Start</a>
+</div>
+<div align="right">(<a href="http://www.sams.com/">Sams</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0672324725">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0672324725">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">The Struts Framework: Practical Guide for Java Programmers</a>
+</div>
+<div align="right">(<a href="http://www.mkp.com/">Morgan-Kaufmann</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1558608621">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1558608621">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Struts in Action</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1930110502">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1930110502">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Professional Jakarta Struts</a>
+</div>
+<div align="right">(<a href="http://www.wrox.com/">Wrox</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764544373">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0764544373">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Struts Survival Guide: Basics to Best Practices</a>
+</div>
+<div align="right">(<a href="http://www.objectsource.com/">ObjectSource</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0974848808">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0974848808">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Mastering Jakarta Struts</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0471213020">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0471213020">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Apache Jakarta Tapestry</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Tapestry in Action</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1932394117">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1932394117">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Apache Ant</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Java Development with Ant</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1930110588">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1930110588">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Ant Developer's Handbook</a>
+</div>
+<div align="right">(<a href="http://www.sams.com/">Sams</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0672324261">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0672324261">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Ant: The Java Build Tool in Practice</a>
+</div>
+<div align="right">(<a href="http://www.charlesriver.com/">Charles River</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1584502487">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1584502487">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Ant: The Definitive Guide</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596001843">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596001843">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Extreme Programming with Ant</a>
+</div>
+<div align="right">(<a href="http://www.sams.com/">Sams</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0672325624">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0672325624">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Apache Jakarta General</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Jakarta Pitfalls</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0471449156">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0471449156">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Apache Jakarta Commons</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Pro Jakarta Commons</a>
+</div>
+<div align="right">(<a href="http://www.apress.com/">Apress</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1590592832">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1590592832">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Applied Software Engineering Using Apache Jakarta Commons</a>
+</div>
+<div align="right">(<a href="http://www.charlesriver.com/">Charles River</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1584502460">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1584502460">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Apache Jakarta Tomcat</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Professional Apache Tomcat</a>
+</div>
+<div align="right">(<a href="http://www.wrox.com/">Wrox</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764543725">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0764543725">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Tomcat: The Definitive Guide</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596003188">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596003188">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Apache Tomcat Bible</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0764526065">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0764526065">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Mastering Tomcat Development</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0471237647">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0471237647">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Apache Tomcat Security Handbook</a>
+</div>
+<div align="right">(<a href="http://www.wrox.com/">Wrox</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1861008309">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1861008309">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>JUnit</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">JUnit in Action</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1930110995">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1930110995">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">JUnit: The Definitive Guide</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596005822">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596005822">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>XDoclet</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">XDoclet in Action</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1932394052">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1932394052">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>General</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Java Open Source Programming</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0471463620">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0471463620">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">J2EE Open Source Toolkit</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0471444359">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0471444359">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Java Tools for eXtreme Programming</a>
+</div>
+<div align="right">(<a href="http://www.wiley.com/">Wiley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/047120708X">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/047120708X">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Java Extreme Programming Cookbook</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596003870">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596003870">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Explorer's Guide to Open Source Java Tools</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1932394192">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1932394192">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Art of Java Web Development</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1932394060">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1932394060">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Eclipse</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Eclipse in Action: A Guide for the Java Developer</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1930110960">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1930110960">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Java Developer's Guide to Eclipse</a>
+</div>
+<div align="right">(<a href="http://www.addisonwesley.com/">Addison-Wesley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0321159640">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0321159640">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Eclipse Modeling Framework</a>
+</div>
+<div align="right">(<a href="http://www.addisonwesley.com/">Addison-Wesley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0131425420">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0131425420">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Contributing to Eclipse: Principles, Patterns, and Plugins</a>
+</div>
+<div align="right">(<a href="http://www.addisonwesley.com/">Addison-Wesley</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0321205758">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0321205758">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Eclipse: Step by Step</a>
+</div>
+<div align="right">(<a href="http://www.mcpressonline.com/">MC Press</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1583470441">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1583470441">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>Hibernate</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">Hibernate in Action</a>
+</div>
+<div align="right">(<a href="http://www.manning.com/">Manning</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/193239415X">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/193239415X">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+  
+<h3>JBoss</h3>
+<ul>
+    
+<li>
+<div align="left">
+<a href="YY">JBoss 3.2 Deployment and Administration</a>
+</div>
+<div align="right">(<a href="http://www.apress.com/">Apress</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1590592816">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1590592816">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">JBoss Administration and Development</a>
+</div>
+<div align="right">(<a href="http://www.sams.com/">Sams</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0672323478">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0672323478">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Core JBoss 3.X: J2EE Application Development and Deployment</a>
+</div>
+<div align="right">(<a href="http://www.prenticehall.com/">Prentice Hall</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/013112594X">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/013112594X">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">The Definitive Guide to JBoss 4</a>
+</div>
+<div align="right">(<a href="http://www.apress.com/">Apress</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/1590593340">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/1590593340">[bkp]</a>
+</div>
+</li>
+    
+<li>
+<div align="left">
+<a href="YY">Using JBoss</a>
+</div>
+<div align="right">(<a href="http://www.oreilly.com/">O'Reilly</a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/0596004079">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/0596004079">[bkp]</a>
+</div>
+</li>
+  
+</ul>
+
+</body>
+</html>
diff --git a/pergamum/page.xsl b/pergamum/page.xsl
new file mode 100644
index 00000000..073c334a
--- /dev/null
+++ b/pergamum/page.xsl
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  version="1.0">
+
+  <xsl:template match="category">
+     <html>
+      <head>
+       <title><xsl:value-of select="@name"/></title>
+      </head>
+      <body>
+       <h2><xsl:value-of select="@name"/></h2>
+       <xsl:apply-templates/>
+      </body>
+     </html>
+  </xsl:template>
+
+  <xsl:template match="subcategory">
+    <h3><xsl:value-of select="@name"/></h3>
+    <ul><xsl:apply-templates/></ul>
+  </xsl:template>
+
+  <xsl:template match="book">
+    <xsl:variable name="isbn">
+      <xsl:value-of select="@isbn"/>
+    </xsl:variable>
+    <xsl:variable name="url">
+      <xsl:value-of select="@url"/>
+    </xsl:variable>
+    <xsl:variable name="pub">
+      <xsl:value-of select="@publisher"/>
+    </xsl:variable>
+    <xsl:variable name="pubUri">
+      <xsl:value-of select="document('publishers.xml')/publishers/publisher[@id=$pub]/@url"/>
+    </xsl:variable>
+    <li><div align="left"><a href="{$url}"><xsl:value-of select="@name"/></a></div> 
+    <div align="right">(<a href="{$pubUri}"><xsl:value-of select="document('publishers.xml')/publishers/publisher[@id=$pub]/@name"/></a>) - <a href="http://www.amazon.com/exec/obidos/tg/detail/-/{$isbn}">[amz]</a> - <a href="http://www.bookpool.com/.x/1/sm/{$isbn}">[bkp]</a></div></li>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/pergamum/plan.txt b/pergamum/plan.txt
new file mode 100644
index 00000000..a790e3ab
--- /dev/null
+++ b/pergamum/plan.txt
@@ -0,0 +1,10 @@
+Assemble ISBN's for books under category/sub-category
+Pull these from an xml file: db.xml.
+
+This should then talk to Amazon's web service? To get the information 
+about those books, apply an xsl? and create a series of html files.
+
+Amazon's web service is bad. Enforces I link to them and only them.
+So apply an xsl to an xml db. Add the names of the books later.
+
+XML -> XSL creates one page with 
diff --git a/pergamum/run.sh b/pergamum/run.sh
new file mode 100755
index 00000000..40bee78d
--- /dev/null
+++ b/pergamum/run.sh
@@ -0,0 +1 @@
+java Style books.xml page.xsl
diff --git a/runsql/example/config/CmdLine.properties b/runsql/example/config/CmdLine.properties
new file mode 100644
index 00000000..2bc4007a
--- /dev/null
+++ b/runsql/example/config/CmdLine.properties
@@ -0,0 +1,5 @@
+com.generationjava.jndi.datasource=true
+driver=org.hsqldb.jdbcDriver
+url=jdbc:hsqldb:hsql://localhost
+user=sa
+password=
diff --git a/runsql/example/jndi.properties b/runsql/example/jndi.properties
new file mode 100644
index 00000000..4b7b0e4b
--- /dev/null
+++ b/runsql/example/jndi.properties
@@ -0,0 +1,2 @@
+java.naming.factory.initial=com.generationjava.jndi.PropertiesFactory
+com.generationjava.jndi.root=config/
diff --git a/runsql/example/sql/BOOTSTRAP.sql b/runsql/example/sql/BOOTSTRAP.sql
new file mode 100644
index 00000000..9373894c
--- /dev/null
+++ b/runsql/example/sql/BOOTSTRAP.sql
@@ -0,0 +1,4 @@
+INSERT INTO Report (name, sql, age) VALUES ('foo', 'select foo', '95');
+INSERT INTO Report (name, sql, age) VALUES ('bar', 'select poo', '5');
+INSERT INTO Report (name, sql, age) VALUES ('poo', 'delete foo', '9');
+INSERT INTO Report (name, sql, age) VALUES ('barry', 'select wfoo', '9191');
diff --git a/runsql/example/sql/CHECK.sql b/runsql/example/sql/CHECK.sql
new file mode 100644
index 00000000..9be0a1fc
--- /dev/null
+++ b/runsql/example/sql/CHECK.sql
@@ -0,0 +1 @@
+SELECT count(*) AS total FROM Report
diff --git a/runsql/example/sql/QUERY.sql b/runsql/example/sql/QUERY.sql
new file mode 100644
index 00000000..f8cb6ce8
--- /dev/null
+++ b/runsql/example/sql/QUERY.sql
@@ -0,0 +1 @@
+SELECT * FROM Bandwidth
diff --git a/runsql/example/sql/SCHEMA.sql b/runsql/example/sql/SCHEMA.sql
new file mode 100644
index 00000000..bba7192d
--- /dev/null
+++ b/runsql/example/sql/SCHEMA.sql
@@ -0,0 +1,11 @@
+DROP TABLE Bandwidth;
+CREATE TABLE Bandwidth (
+    last_total varchar(255),
+    this_total varchar(255),
+    last_in varchar(255),
+    this_in varchar(255),
+    last_out varchar(255),
+    this_out varchar(255),
+    last_sess varchar(255),
+    this_sess varchar(255)
+);
diff --git a/runsql/project.properties b/runsql/project.properties
new file mode 100644
index 00000000..18a9eb1e
--- /dev/null
+++ b/runsql/project.properties
@@ -0,0 +1,6 @@
+maven.checkstyle.header.file=/dev/null
+maven.repo.remote=http://www.generationjava.com/jars/,http://www.ibiblio.org/maven/
+
+maven.ui.banner.background=#000
+maven.ui.section.background=#000
+maven.ui.subsection.background=#000  
diff --git a/runsql/project.xml b/runsql/project.xml
new file mode 100644
index 00000000..f07a0e21
--- /dev/null
+++ b/runsql/project.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+<project>
+  
+  <pomVersion>3</pomVersion>
+  <id>runsql</id>
+  <name>runsql</name>
+  <currentVersion>0.1</currentVersion>
+  <organization>
+    <name>GenerationJava</name>
+    <url>http://www.generationjava.com/</url>
+    <logo>/images/initials.jpg</logo>
+  </organization>
+  <inceptionYear>2003</inceptionYear>
+  <package>org.osjava.runsql</package>
+  <logo>/images/core-logo.jpg</logo>
+  
+  <description>
+    A command line runner of SQL statements. I like piping sql statements into the mysql command on a unix machine. This is designed to let me do the same things in a database independent way.
+  </description>
+  
+  <shortDescription>SQL Script Runner</shortDescription>
+
+  <url>http://www.osjava.org/runsql/</url>
+  <siteAddress>www.osjava.org/runsql</siteAddress>
+  <siteDirectory>/sites/org/osjava/www/runsql/</siteDirectory>
+  <distributionDirectory>/sites/org/osjava/www/builds/releases/runsql/</distributionDirectory>
+
+  <repository>
+    <connection>scm:cvshen@umbongo.flamefew.net:/var/cvs:runsql</connection>
+    <url>http://www.generationjava.com/view-cvs/viewcvs.cgi/runsql/</url>
+  </repository>
+
+  <versions>
+    <version>
+      <id>0.1</id>
+      <name>0.1</name>
+      <tag>HEAD</tag>
+    </version>
+  </versions>
+
+  <branches>
+  </branches>
+
+  <!--
+  <mailingLists>
+    <mailingList>
+    </mailingList>
+  </mailingLists>
+  -->
+
+  <developers>
+
+    <developer>
+      <name>Henri Yandell</name>
+      <id>hen</id>
+      <email>bayard@generationjava.com</email>
+      <organization>GenerationJava</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <id>commons-dbutils</id>
+      <version>SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <id>genjava-core</id>
+      <version>2.0</version>
+      <url>http://www.generationjava.com/projects/GenJavaCore.shtml</url>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <nagEmailAddress>bayard@www.generationjava.com</nagEmailAddress>
+
+    <sourceDirectory>src/java</sourceDirectory>
+
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+  </build>
+</project>
+
diff --git a/runsql/src/java/org/osjava/runsql/RunSql.java b/runsql/src/java/org/osjava/runsql/RunSql.java
new file mode 100644
index 00000000..27885c7d
--- /dev/null
+++ b/runsql/src/java/org/osjava/runsql/RunSql.java
@@ -0,0 +1,67 @@
+package org.osjava.runsql;
+
+import java.io.*;
+import java.sql.*;
+import javax.sql.*;
+import javax.naming.*;
+import org.apache.commons.dbutils.*;
+import org.apache.commons.lang.*;
+import com.generationjava.io.*;
+
+public class RunSql {
+
+    static public void main(String[] args) throws Exception {
+        String dsname = args[0];
+        InitialContext ctxt = new InitialContext();
+        DataSource ds = (DataSource)ctxt.lookup(dsname);
+        Connection conn = ds.getConnection();
+        try {
+            runScript(conn, System.in);
+        } catch(SQLException sqle) {
+            System.err.println("Script failure. ");
+            sqle.printStackTrace();
+        } finally {
+            DbUtils.closeQuietly(conn);
+        }
+    }
+
+    static public void runScript(Connection conn, InputStream in) throws SQLException {
+        runScript(conn, FileW.loadFile(in));
+    }
+
+    static public void runScript(Connection conn, String script) throws SQLException {
+        // TODO: Improve so a ; inside a string is ignored.
+        String[] stmts = StringUtils.split(script, ";");
+        Statement stmt = conn.createStatement();
+        try {
+            for(int i=0; i<stmts.length; i++) {
+                boolean resultset = stmt.execute(stmts[i]);
+//                System.err.println("Executing: "+stmts[i]);
+                if(resultset) {
+//                    System.out.println("Result: ");
+                    ResultSet rs = stmt.getResultSet();
+                    ResultSetMetaData rsmd = rs.getMetaData();
+                    int count = rsmd.getColumnCount();
+                    count++;
+                    for(int j=1; j<count; j++) {
+                        System.out.print(""+rsmd.getColumnName(j));
+                        System.out.print(" | ");
+                    }
+                    System.out.println();
+                    while(rs.next()) {
+                        for(int j=1; j<count; j++) {
+                            System.out.print(""+rs.getObject(j));
+                            System.out.print(" | ");
+                        }
+                        System.out.println();
+                    }
+                } else {
+//                    System.err.println("Rows changed: "+stmt.getUpdateCount());
+                }
+            }
+        } finally {
+            DbUtils.closeQuietly(stmt);
+        }
+    }
+
+}
diff --git a/scraping-engine/TODO b/scraping-engine/TODO
new file mode 100644
index 00000000..d6b6a601
--- /dev/null
+++ b/scraping-engine/TODO
@@ -0,0 +1,45 @@
+Hide Config behind Session??
+
+Implement Store
+   using hsqldb   [DONE. Needs testing]
+Implement Notification
+   [DONE. Needs implementation of EmailNotifier]
+Implement Scheduler
+   [DONE. Does not fulfill all requirements yet]
+:::
+All must be pluggable
+
+Implement a 'REPLACE' statement style Store, which tries an update, then 
+an insert. or vice-versa.
+
+Different threads for db than io??
+
+ClassLoader for parsers
+Scheduler needs to check config to figure out if it should reschedule
+
+Schedulers need to understand:
+
+cron
+'startup'
+interval based
+[ALL DONE]
+Also need to understand the concept of:  Run until success or Time.
+
+Pages need to know their URIs
+
+CheckingParsers need to be thought about. 
+Sometimes the Check might want to be a lot of times.
+Maybe a Checker exists, but not a CheckingParser. So Parsers 
+can call Checkers.
+
+Or:  A Parser has a precondition/postcondition. These are the checkers.
+
+Specify a Page content-type. ie) loose html, xhtml, csv, xml, xls etc. 
+  This would lead to a sub-class of Page in reply
+
+Long-term:
+
+Provide a scraping language
+Provide a design GUI
+Provide an automatic analyser. Looks for tables with high levels of 
+content. Looks for comments etc.
diff --git a/scraping-engine/project.properties b/scraping-engine/project.properties
new file mode 100644
index 00000000..f498c725
--- /dev/null
+++ b/scraping-engine/project.properties
@@ -0,0 +1,7 @@
+maven.checkstyle.header.file=/dev/null
+maven.repo.remote=http://www.generationjava.com/jars2/,http://www.ibiblio.org/maven/
+
+maven.ui.banner.background=#000
+maven.ui.section.background=#000
+maven.ui.subsection.background=#000
+
diff --git a/scraping-engine/project.xml b/scraping-engine/project.xml
new file mode 100644
index 00000000..087a87bf
--- /dev/null
+++ b/scraping-engine/project.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<project>
+  
+  <pomVersion>3</pomVersion>
+  <id>scraping-engine</id>
+  <name>scraping-engine</name>
+  <currentVersion>0.1</currentVersion>
+  <organization>
+    <name>GenerationJava</name>
+    <url>http://www.generationjava.com/</url>
+    <logo>/images/initials.jpg</logo>
+  </organization>
+  <inceptionYear>2003</inceptionYear>
+  <package>com.generationjava.jndi</package>
+  <logo>/images/core-logo.jpg</logo>
+  
+  <!-- Gump integration -->
+  <gumpRepositoryId>scraping-engine</gumpRepositoryId>
+
+  <description>
+    A simple implementation of JNDI. It is entirely library based, so no server instances are started, and it sits upon Java .properties files, so it is easy to use and simple to understand. The .properties files may be either on the file system or in the classpath. 
+  </description>
+  
+  <shortDescription>A JNDI implementation using .properties</shortDescription>
+
+  <url>http://www.generationjava.com/</url>
+  <!--
+  <issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
+  -->
+  <siteAddress>www.generationjava.com/maven/scraping-engine</siteAddress>
+  <siteDirectory>/sites/com/generationjava/www/maven/genjava/scraping-engine/</siteDirectory>
+  <distributionDirectory>/sites/com/generationjava/www/maven/builds/</distributionDirectory>
+
+  <repository>
+    <connection>scm:cvshen@umbongo.flamefew.net:/var/cvs:scraping-engine</connection>
+    <url>http://www.generationjava.com/view-cvs/viewcvs.cgi/scraping-engine/</url>
+  </repository>
+
+  <versions>
+    <version>
+      <id>1.0</id>
+      <name>1.0</name>
+      <tag>HEAD</tag>
+    </version>
+  </versions>
+
+  <branches>
+  </branches>
+
+  <!--
+  <mailingLists>
+    <mailingList>
+    </mailingList>
+  </mailingLists>
+  -->
+
+  <developers>
+
+    <developer>
+      <name>Henri Yandell</name>
+      <id>hen</id>
+      <email>bayard@generationjava.com</email>
+      <organization>GenerationJava</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+
+  </developers>
+
+  <contributors>
+  </contributors>
+  
+  <!-- Need to mark these as compile-time/run-time -->
+
+  <dependencies>
+    <dependency>
+      <id>log4j</id>
+      <version>1.2.7</version>
+      <url>http://jakarta.apache.org/log4j/</url>
+    </dependency>
+    <dependency>
+      <id>commons-lang</id>
+      <version>1.0</version>
+      <url>http://jakarta.apache.org/commons/lang.html</url>
+    </dependency>
+    <dependency>
+      <id>commons-httpclient</id>
+      <version>2.0-alpha2</version>
+      <url>http://jakarta.apache.org/commons/</url>
+    </dependency>
+    <dependency>
+      <id>commons-collections</id>
+      <version>2.1</version>
+      <url>http://jakarta.apache.org/commons/</url>
+    </dependency>
+    <dependency>
+      <id>commons-dbutils</id>
+      <version>SNAPSHOT</version>
+      <url>http://jakarta.apache.org/commons/</url>
+    </dependency>
+    <dependency>
+      <id>genjava-core</id>
+      <version>2.0</version>
+      <url>http://www.generationjava.com/</url>
+    </dependency>
+    <dependency>
+      <id>simple-jndi</id>
+      <version>0.5</version>
+      <url>http://www.generationjava.com/</url>
+    </dependency>
+    <dependency>
+      <id>quartz</id>
+      <version>1.0.7</version>
+      <url>http://www.part.net/quartz.html</url>
+    </dependency>
+  </dependencies>
+
+  <build>
+
+    <nagEmailAddress>bayard@www.generationjava.com</nagEmailAddress>
+
+    <sourceDirectory>src/java</sourceDirectory>
+
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <!--
+
+    <integrationUnitTestSourceDirectory/>
+
+    <aspectSourceDirectory></aspectSourceDirectory>
+
+    <unitTestPatterns>
+      <unitTestPattern>include = **/*Test.java</unitTestPattern>
+    </unitTestPatterns>
+
+    <integrationUnitTestPatterns>
+    </integrationUnitTestPatterns>
+    -->
+
+    <!-- J A R  R E S O U R C E S -->
+    <!-- Resources that are packaged up inside the JAR file -->
+
+    <jarResources>
+        <jarResource>include = *.dtd</jarResource>
+        <jarResource>include = log4j.properties</jarResource>
+    </jarResources>
+
+    <jars>
+    </jars>
+  </build>
+</project>
+
diff --git a/scraping-engine/run.sh b/scraping-engine/run.sh
new file mode 100755
index 00000000..92290745
--- /dev/null
+++ b/scraping-engine/run.sh
@@ -0,0 +1 @@
+java -classpath .:target/scraping-engine-0.1.jar:/usr/local/javalib/commons-collections-2.1.jar:/usr/local/javalib/commons-lang-1.0.1.jar:/usr/local/javalib/genjava-core-2.0.jar:config/:/usr/local/javalib/maven/repository/simple-jndi/jars/simple-jndi-0.5.jar:/usr/local/javalib/commons-httpclient-2.0-alpha2.jar:/usr/local/javalib/commons-logging-1.0.1.jar:/usr/local/javalib/maven/repository/commons-dbutils/jars/commons-dbutils-SNAPSHOT.jar:/usr/local/javalib/mm.mysql-2.0.9-bin.jar:/Users/hen/Desktop/hsqldb/lib/hsqldb.jar:/usr/local/javalib/maven/repository/log4j/jars/log4j-1.2.7.jar:/usr/local/javalib/maven/repository/quartz/jars/quartz-1.0.7.jar org.osjava.scraping.Engine
diff --git a/scraping-engine/runc.sh b/scraping-engine/runc.sh
new file mode 100755
index 00000000..6837e24d
--- /dev/null
+++ b/scraping-engine/runc.sh
@@ -0,0 +1 @@
+javac -classpath /usr/local/javalib/commons-lang-1.0.1.jar:/usr/local/javalib/genjava-core-2.0.jar:target/scraping-engine-0.1.jar:.:/usr/local/javalib/maven/repository/log4j/jars/log4j-1.2.7.jar com/*/scraper/*.java
diff --git a/scraping-engine/src/java/org/osjava/scraping/AbstractConfig.java b/scraping-engine/src/java/org/osjava/scraping/AbstractConfig.java
new file mode 100644
index 00000000..0ef2a1aa
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/AbstractConfig.java
@@ -0,0 +1,70 @@
+package org.osjava.scraping;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.commons.lang.NumberUtils;
+import java.util.Date;
+
+public abstract class AbstractConfig implements Config {
+
+    private String context = "";
+
+    protected abstract Object getValue(String key);
+
+    public Object get(String key) {
+        return getValue( getContext()+key );
+    }
+
+    public boolean has(String key) {
+        return (get(key) != null);
+    }
+
+    public Object getAbsolute(String key) {
+        return getValue(key);
+    }
+
+    public String getString(String key) {
+        return (String)get(key);
+    }
+
+    public Date getDate(String key) {
+        try {
+            return java.text.DateFormat.getDateInstance(java.text.DateFormat.SHORT).parse(key);
+        } catch(java.text.ParseException pe) {
+            return null;
+        }
+    }
+
+    // rely on simple-jndi's type
+    public int getInt(String key) {
+        return NumberUtils.stringToInt(getString(key));
+    }
+
+    public List getList(String key) {
+        Object obj = get(key);
+        if(!(obj instanceof List)) {
+            List list = new ArrayList(1);
+            list.add(obj);
+            obj = list;
+        }
+        return (List)obj;
+    }
+
+    public void setContext(String context) {
+        this.context = context;
+    }
+
+    public String getContext() {
+        return this.context;
+    }
+
+    public Config cloneConfig() {
+        try {
+            return (Config)this.clone();
+        } catch(CloneNotSupportedException cnse) {
+            // ignore
+            throw new RuntimeException("Cloning of a Config failed. This should be impossible. ");
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/AbstractPage.java b/scraping-engine/src/java/org/osjava/scraping/AbstractPage.java
new file mode 100644
index 00000000..7aec7eab
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/AbstractPage.java
@@ -0,0 +1,66 @@
+package org.osjava.scraping;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+import java.io.BufferedReader;
+
+import org.apache.log4j.Logger;
+
+public abstract class AbstractPage implements Page {
+
+    private static Logger logger = Logger.getLogger(AbstractPage.class);
+
+    private String documentBase;
+
+    public AbstractPage() {
+    }
+
+    public abstract Reader read() throws IOException;
+
+    public Page fetch(String uri, Config cfg, Session session) throws FetchingException {
+        int idx = uri.indexOf("://");
+        if(idx == -1) {
+            // TODO: also check it is less than 15 or something??
+            uri = this.documentBase + "/" + uri;
+        }
+        logger.debug("Fetching: "+uri);
+        Fetcher fetcher = FetchingFactory.getFetcher(cfg, session);
+        Page page = fetcher.fetch(uri, cfg, session);
+        return page;
+    }
+
+    public void setDocumentBase(String documentBase) {
+        logger.debug("Document base: "+documentBase);
+        this.documentBase = documentBase;
+    }
+
+    public String getDocumentBase() {
+        return this.documentBase;
+    }
+
+    public String readAsString() throws IOException {
+        Reader rdr = null;
+        try {       
+            rdr = this.read();
+            BufferedReader bfr = new BufferedReader(rdr);
+            StringBuffer buffer = new StringBuffer();
+            String line = "";
+            while( (line = bfr.readLine()) != null) {
+                buffer.append(line);
+                buffer.append("\n");
+            }
+            return buffer.toString();
+        } finally {
+            if(rdr != null) {
+                try {
+                    rdr.close();
+                } catch(IOException ioe) {
+                    // ignore
+                }
+            }
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/AbstractParser.java b/scraping-engine/src/java/org/osjava/scraping/AbstractParser.java
new file mode 100644
index 00000000..3ed3099d
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/AbstractParser.java
@@ -0,0 +1,13 @@
+package org.osjava.scraping;
+
+public abstract class AbstractParser implements Parser {
+
+    abstract public Result parse(Page page, Config cfg, Session session) throws ParsingException;
+
+    public void startUp(Config cfg) throws Exception { }
+    public void bringDown(Config cfg) throws Exception { }
+
+    // helper methods
+    // ??
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/CheckingParser.java b/scraping-engine/src/java/org/osjava/scraping/CheckingParser.java
new file mode 100644
index 00000000..3344505d
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/CheckingParser.java
@@ -0,0 +1,23 @@
+package org.osjava.scraping;
+
+public abstract class CheckingParser extends AbstractParser {
+
+    public Result parse(Page page, Config cfg, Session session) throws ParsingException {
+        Header header = parseHeader(page, cfg, session);
+        Store store = StoreFactory.getStore(cfg, session);
+        try {
+            boolean found = store.exists(header, cfg, session);
+            if(found) {
+                return new NullResult();
+            } else {
+                return parseBody(page, header, cfg, session);
+            }
+        } catch(StoringException se) {
+            return new NullResult();
+        }
+    }
+
+    public abstract Header parseHeader(Page page, Config cfg, Session session) throws ParsingException;
+    public abstract Result parseBody(Page page, Header header, Config cfg, Session session) throws ParsingException;
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Config.java b/scraping-engine/src/java/org/osjava/scraping/Config.java
new file mode 100644
index 00000000..088fa178
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Config.java
@@ -0,0 +1,19 @@
+package org.osjava.scraping;
+
+import java.util.List;
+import java.util.Date;
+
+public interface Config extends Cloneable {
+
+    public Object get(String key);
+    public boolean has(String key);
+    public Object getAbsolute(String key);
+    public String getString(String key);
+    public int getInt(String key);
+    public Date getDate(String key);
+    public List getList(String key);
+    public void setContext(String context);
+    public String getContext();
+    public Config cloneConfig();
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/ConfigFactory.java b/scraping-engine/src/java/org/osjava/scraping/ConfigFactory.java
new file mode 100644
index 00000000..e501d1e6
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/ConfigFactory.java
@@ -0,0 +1,9 @@
+package org.osjava.scraping;
+
+public class ConfigFactory {
+
+    static public Config getConfig(String[] args) {
+        return new JndiConfig();
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Engine.java b/scraping-engine/src/java/org/osjava/scraping/Engine.java
new file mode 100644
index 00000000..fa78e367
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Engine.java
@@ -0,0 +1,93 @@
+package org.osjava.scraping;
+
+import java.util.List;
+import java.io.Reader;
+
+public class Engine implements Runner {
+
+    public static void main(String[] args) {
+        Engine engine = new Engine();
+        engine.run(args);
+    }
+
+/// TODO: Implement the Scheduler aspect
+///  The Scheduler notifies only this class. It is 
+///  then up to this Engine to run the parsers.
+/// TODO: Put the scraping and db in a different thread
+    public void run(String[] args) {
+        // load the config
+        Config cfg = ConfigFactory.getConfig(args);
+
+
+        // test and how schedule=startup will be handled
+        List list = cfg.getList("org.osjava.scrapers");
+        for(int i=0; i<list.size(); i++) {
+            String key = (String)list.get(i);
+
+            Session session = new NamespaceSession();
+            session.put("org.osjava.scraper", key);
+            cfg.setContext(key+".");
+
+//            String scheduler = cfg.getString("scheduler");
+
+            // schedule the times to run parsers
+            // TODO: allow this to be pluggable.
+            Scheduler scheduler = SchedulerFactory.getScheduler(cfg, session);
+            // Engine suddenly becomes a part of the system. 
+            // Possibly the run(Config, Session) needs to 
+            // move into an interface
+            scheduler.schedule(cfg, session, this);
+
+            // temporary running
+//            run(cfg, session);
+        }
+    }
+
+// From here down is the execution part of a scraper. Runner maybe.
+    public void run(Config cfg, Session session) {
+
+        try {
+            // fetch the uri
+            Fetcher fetcher = FetchingFactory.getFetcher(cfg, session);
+                
+            // throws FetchingException
+            String uri = cfg.getString("uri");
+            Page page = fetcher.fetch(uri, cfg, session);
+
+            // parse the data
+            Parser parser = ParserFactory.getParser(cfg, session);
+            // throws ParsingException
+            Result result = parser.parse(page, cfg, session);
+
+            // store the data
+            Store store = StoreFactory.getStore(cfg, session);
+
+            // throws StoringException
+            store.store(result, cfg, session);
+
+            // notify parties
+            Notifier notifier = NotificationFactory.getSuccessNotifier(cfg, session);
+            notifier.notify(cfg, session);
+        } catch(FetchingException fe) {
+            notifyError(cfg, session, fe);
+        } catch(ParsingException pe) {
+            notifyError(cfg, session, pe);
+        } catch(StoringException se) {
+            notifyError(cfg, session, se);
+        } catch(NotificationException ne) {
+            notifyError(cfg, session, ne);
+        }
+    }
+
+    private static void notifyError(Config cfg, Session session, Exception e) {
+        try {
+            Notifier notifier = NotificationFactory.getErrorNotifier(cfg, session, e);
+            session.put(cfg.getContext()+".error", e);
+            notifier.notify(cfg, session);
+            session.remove(cfg.getContext()+".error");
+        } catch(NotificationException ne) {
+            ne.printStackTrace();
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Fetcher.java b/scraping-engine/src/java/org/osjava/scraping/Fetcher.java
new file mode 100644
index 00000000..e806ee0d
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Fetcher.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+/**
+ * Fetches a piece of content for a uri
+ * Usually hidden behind a FetcherFactory.
+ */
+public interface Fetcher {
+
+    // allow URL url??
+    public Page fetch(String uri, Config cfg, Session session) throws FetchingException;
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/FetchingException.java b/scraping-engine/src/java/org/osjava/scraping/FetchingException.java
new file mode 100644
index 00000000..84600439
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/FetchingException.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+public class FetchingException extends Exception {
+
+    public FetchingException(String msg) {
+        super(msg);
+    }
+
+    public FetchingException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/FetchingFactory.java b/scraping-engine/src/java/org/osjava/scraping/FetchingFactory.java
new file mode 100644
index 00000000..fd9e0ecb
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/FetchingFactory.java
@@ -0,0 +1,21 @@
+package org.osjava.scraping;
+
+public class FetchingFactory {
+
+    static public Fetcher getFetcher(Config cfg, Session session) {
+        String uri = cfg.getString("uri");
+        if(uri == null) {
+            return new NullFetcher();
+        }
+
+        if(uri.startsWith("http://")) {
+            return new HttpFetcher();
+        }
+        if(uri.startsWith("https://")) {
+            return new HttpsFetcher();
+        }
+
+        return new NullFetcher();
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Header.java b/scraping-engine/src/java/org/osjava/scraping/Header.java
new file mode 100644
index 00000000..09bc911b
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Header.java
@@ -0,0 +1,7 @@
+package org.osjava.scraping;
+
+public interface Header extends Comparable {
+
+    public Object getValue();
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/HttpFetcher.java b/scraping-engine/src/java/org/osjava/scraping/HttpFetcher.java
new file mode 100644
index 00000000..3ab2b407
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/HttpFetcher.java
@@ -0,0 +1,34 @@
+package org.osjava.scraping;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import com.generationjava.net.UrlW;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Fetches a piece of content for a url
+ */
+public class HttpFetcher implements Fetcher {
+
+    public Page fetch(String uri, Config cfg, Session session) throws FetchingException {
+        try {
+            URL url = new URL(uri);  
+            String txt = ""+UrlW.getContent(uri);
+            Page page = new MemoryPage(txt);
+            String base = url.getProtocol()+"://"+url.getHost();
+            if(url.getPort() != 80 && url.getPort() != -1) {
+                base += ":"+url.getPort();
+            }
+            base += StringUtils.chomp(url.getPath(), "/");
+            page.setDocumentBase(base);
+            return page;
+        } catch(MalformedURLException murle) {
+            throw new FetchingException("Bad uri. "+murle.getMessage(), murle);
+        } catch(IOException ioe) {
+            throw new FetchingException("Error. "+ioe.getMessage(), ioe);
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/HttpsFetcher.java b/scraping-engine/src/java/org/osjava/scraping/HttpsFetcher.java
new file mode 100644
index 00000000..1cc73584
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/HttpsFetcher.java
@@ -0,0 +1,53 @@
+package org.osjava.scraping;
+
+import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.methods.*;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import com.generationjava.net.UrlW;
+
+/**
+ * Fetches a piece of content for a url
+ */
+public class HttpsFetcher implements Fetcher {
+
+    public Page fetch(String uri, Config cfg, Session session) throws FetchingException {
+        try {
+            URL url = new URL(uri);
+            HttpClient client = new HttpClient();
+            GetMethod get = new GetMethod(url.getFile());
+            UsernamePasswordCredentials upc = new UsernamePasswordCredentials(
+                cfg.getString("username"), cfg.getString("password") 
+            );
+
+            int port = url.getPort();
+            if(port == -1) {
+                port = 443;
+            }
+            client.startSession( url.getHost(), 
+                                 port,
+                                 upc,
+                                 true
+            );
+            if(cfg.has("timeout")) {
+                client.setTimeout(cfg.getInt("timeout"));
+            }
+            int result = client.executeMethod(get);
+            if(result != 200) {
+                throw new FetchingException("Unable to fetch from "+uri+" due to error code "+result);
+            }
+            String txt = get.getResponseBodyAsString();
+            Page page = new MemoryPage(txt);
+            String base = url.getProtocol()+"://"+url.getHost();
+            if(url.getPort() != 443) {
+                base += ":"+url.getPort();
+            }
+            page.setDocumentBase(base);
+            return page;
+        } catch(IOException ioe) {
+            throw new FetchingException("Error. "+ioe.getMessage(), ioe);
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/JdbcStore.java b/scraping-engine/src/java/org/osjava/scraping/JdbcStore.java
new file mode 100644
index 00000000..471795b8
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/JdbcStore.java
@@ -0,0 +1,62 @@
+package org.osjava.scraping;
+
+import java.util.Iterator;
+import javax.sql.DataSource;
+import java.sql.*;
+import org.apache.commons.dbutils.DbUtils;
+import org.apache.commons.lang.StringUtils;
+
+import org.apache.log4j.Logger;
+
+public class JdbcStore implements Store {
+
+    private static Logger logger = Logger.getLogger(JdbcStore.class);
+
+    public void store(Result result, Config cfg, Session session) throws StoringException {
+        Connection conn = null;
+try {
+        // get DataSource from cfg
+        String dsname = cfg.getString("jdbc.DS");
+//        System.err.println("DSNAME: "+dsname);
+//        System.err.println("/DSNAME: "+cfg.getAbsolute(dsname));
+        DataSource ds = (DataSource)cfg.getAbsolute(dsname);
+//        System.err.println("DataSource: "+ds);
+        conn = ds.getConnection();
+//        System.err.println("CONN: "+conn);
+        String sql = cfg.getString("jdbc.sql");
+//        System.err.println("SQL: "+sql);
+        String table = cfg.getString("jdbc.table");
+//        System.err.println("Table: "+table);
+        if(sql == null) {
+            if(table == null) {
+                throw new StoringException(cfg.getContext()+".jdbc.sql or "+cfg.getContext()+".jdbc.table must be specified. ");
+            }
+        }
+
+        Iterator iterator = result.iterateRows();
+        while(iterator.hasNext()) {
+            Object[] row = (Object[])iterator.next();
+            if(row.length == 0) {
+                logger.error("Empty row found. Skipping. ");
+                continue;
+            }
+            if(sql == null) {
+                if(table != null) {  
+                    sql = "INSERT INTO " + table + " VALUES(?"+ StringUtils.repeat(", ?", row.length-1) + ")";
+                }
+            }
+            int count = DbUtils.executeUpdate( conn, sql, row );
+        }
+
+} catch(SQLException sqle) {
+    throw new StoringException("JDBC Storing Error: "+sqle.getMessage(), sqle);
+} finally {
+        DbUtils.closeQuietly( conn );
+}
+    }
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException {
+        // need to write some kind of checking in here
+        return false;
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/JndiConfig.java b/scraping-engine/src/java/org/osjava/scraping/JndiConfig.java
new file mode 100644
index 00000000..b8fb0978
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/JndiConfig.java
@@ -0,0 +1,35 @@
+package org.osjava.scraping;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+
+public class JndiConfig extends AbstractConfig {
+
+    private static Logger logger = Logger.getLogger(JndiConfig.class);
+
+    private Context ctxt;
+
+    public JndiConfig() {
+        try {
+            this.ctxt = new InitialContext();
+        } catch(NamingException ne) {
+            // TODO: Log
+            logger.debug("Error creating context. ", ne);
+            throw new RuntimeException("Unable to make InitialContext. No JNDI. ");
+        }
+    }
+
+    protected Object getValue(String key) {
+        try {
+            return ctxt.lookup(key);
+        } catch(NamingException ne) {
+            logger.debug("JNDI failed to find: "+key);
+            return null;
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/LoopParser.java b/scraping-engine/src/java/org/osjava/scraping/LoopParser.java
new file mode 100644
index 00000000..4d9b5184
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/LoopParser.java
@@ -0,0 +1,24 @@
+package org.osjava.scraping;
+
+public abstract class LoopParser extends AbstractParser {
+
+    private boolean finished = false;
+
+    public Result parse(Page page, Config cfg, Session session) throws ParsingException {
+        MultiResult result = new MultiResult();
+        int index = 0;
+        while(!finished) {
+            // fetch new page.... how??
+            result.addResult(this.parse(page, cfg, session, index));
+            index++;
+        }
+        return result;
+    }
+
+    abstract Result parse(Page page, Config cfg, Session session, int index) throws ParsingException;
+
+    void finished() {
+        this.finished = true;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/MemoryPage.java b/scraping-engine/src/java/org/osjava/scraping/MemoryPage.java
new file mode 100644
index 00000000..e5f80e2d
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/MemoryPage.java
@@ -0,0 +1,19 @@
+package org.osjava.scraping;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+public class MemoryPage extends AbstractPage {
+
+    private String page;
+
+    public MemoryPage(String page) {
+        this.page = page;
+    }
+
+    public Reader read() throws IOException {
+        return new StringReader(this.page);
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/MultiParser.java b/scraping-engine/src/java/org/osjava/scraping/MultiParser.java
new file mode 100644
index 00000000..751b095e
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/MultiParser.java
@@ -0,0 +1,26 @@
+package org.osjava.scraping;
+
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Iterator;
+
+public abstract class MultiParser extends AbstractParser {
+
+    private List queue = new LinkedList();
+
+    public Result parse(Page page, Config cfg, Session session) throws ParsingException {
+        Iterator iterator = queue.iterator();
+        MultiResult result = new MultiResult();
+        while(iterator.hasNext()) {
+            Parser parser = (Parser)iterator.next();
+            // fetch new page.... how??
+            result.addResult(parser.parse(page, cfg, session));
+        }
+        return result;
+    }
+
+    void addParser(Parser m) {
+        this.queue.add(m);
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/MultiResult.java b/scraping-engine/src/java/org/osjava/scraping/MultiResult.java
new file mode 100644
index 00000000..ff657934
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/MultiResult.java
@@ -0,0 +1,55 @@
+package org.osjava.scraping;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+public class MultiResult implements Result {
+
+    private List list = new LinkedList();
+
+    public MultiResult() {
+    }
+
+    public void addResult(Result result) {
+        /// TODO: Might want to rethink this in case 
+        ///       results hide a lot of resource or something
+        this.list.add(result.iterateRows());
+    }
+
+    public Iterator iterateRows() {
+        return new MultiIterator(this.list);
+    }
+
+}
+
+class MultiIterator implements Iterator {
+
+    private List list;
+    private int current;
+    private int max;
+
+    public MultiIterator(List list) {
+        this.list = list;
+        this.max = list.size() - 1;
+    }
+
+    public boolean hasNext() {
+        boolean b = ((Iterator)list.get(this.current)).hasNext();
+        if(!b) {
+            if(this.current == max) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public Object next() {
+        return ((Iterator)list.get(this.current)).next();
+    }
+
+    public void remove() {
+        ((Iterator)list.get(this.current)).remove();
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NamespaceSession.java b/scraping-engine/src/java/org/osjava/scraping/NamespaceSession.java
new file mode 100644
index 00000000..125b8cc0
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NamespaceSession.java
@@ -0,0 +1,30 @@
+package org.osjava.scraping;
+
+import java.util.List;
+import com.generationjava.namespace.Namespace;
+import com.generationjava.namespace.SimpleNamespace;
+
+public class NamespaceSession extends AbstractConfig implements Session {
+
+    private Namespace namespace;
+
+    public NamespaceSession() {
+        this.namespace = new SimpleNamespace();
+    }
+
+    protected Object getValue(String key) {
+        return this.namespace.getValue(key);
+    }
+
+    public void put(String key, Object value) {
+        this.namespace.putValue(key, value);
+    }
+
+    // TODO: Move to AbstractSession
+    public Object remove(String key) {
+        Object obj = get(key);
+        this.namespace.putValue(key, null);
+        return obj;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NotificationException.java b/scraping-engine/src/java/org/osjava/scraping/NotificationException.java
new file mode 100644
index 00000000..e8d0152a
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NotificationException.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+public class NotificationException extends Exception {
+
+    public NotificationException(String msg) {
+        super(msg);
+    }
+
+    public NotificationException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NotificationFactory.java b/scraping-engine/src/java/org/osjava/scraping/NotificationFactory.java
new file mode 100644
index 00000000..09201f64
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NotificationFactory.java
@@ -0,0 +1,28 @@
+package org.osjava.scraping;
+
+import org.osjava.scraping.util.FactoryUtils;
+
+public class NotificationFactory {
+
+    static public Notifier getSuccessNotifier(Config cfg, Session session) {
+        String name = cfg.getString("notifier.success");
+        Notifier notifier = (Notifier)FactoryUtils.getObject(name, "Notifier");
+        if(notifier == null) {
+            throw new RuntimeException("Unable to find Success Notifier. ");
+        }
+        return notifier;
+    }
+
+    static public Notifier getErrorNotifier(Config cfg, Session session, Exception e) {
+        String name = cfg.getString("notifier.error."+e.getClass().getName());
+        if(name == null) {
+            name = cfg.getString("notifier.error");
+        }
+        Notifier notifier = (Notifier)FactoryUtils.getObject(name, "Notifier");
+        if(notifier == null) {
+            throw new RuntimeException("Unable to find Error Notifier. ");
+        }
+        return notifier;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Notifier.java b/scraping-engine/src/java/org/osjava/scraping/Notifier.java
new file mode 100644
index 00000000..be897f42
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Notifier.java
@@ -0,0 +1,11 @@
+package org.osjava.scraping;
+
+// can notify success and error. How to separate?
+// have a Formatter for formatting the thing? Opposite of a 
+// Converter really
+
+public interface Notifier {
+
+    public void notify(Config cfg, Session session) throws NotificationException;
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NullFetcher.java b/scraping-engine/src/java/org/osjava/scraping/NullFetcher.java
new file mode 100644
index 00000000..eeb5d037
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NullFetcher.java
@@ -0,0 +1,9 @@
+package org.osjava.scraping;
+
+public class NullFetcher implements Fetcher {
+
+    public Page fetch(Config cfg, Session session) throws FetchingException {
+        return new NullPage();
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NullNotifier.java b/scraping-engine/src/java/org/osjava/scraping/NullNotifier.java
new file mode 100644
index 00000000..ae36a627
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NullNotifier.java
@@ -0,0 +1,8 @@
+package org.osjava.scraping;
+
+public class NullNotifier implements Notifier {
+
+    public void notify(Config cfg, Session session) {
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NullPage.java b/scraping-engine/src/java/org/osjava/scraping/NullPage.java
new file mode 100644
index 00000000..56291b24
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NullPage.java
@@ -0,0 +1,16 @@
+package org.osjava.scraping;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+public class NullPage extends AbstractPage {
+
+    public NullPage() {
+    }
+
+    public Reader read() throws IOException {
+        return new StringReader("");
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NullParser.java b/scraping-engine/src/java/org/osjava/scraping/NullParser.java
new file mode 100644
index 00000000..f5996552
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NullParser.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+public class NullParser implements Parser {
+
+    public Result parse(Page page, Config cfg, Session session) throws ParsingException {
+        return new NullResult();
+    }
+    public void startUp(Config cfg) throws Exception {
+    }
+    public void bringDown(Config cfg) throws Exception {
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NullResult.java b/scraping-engine/src/java/org/osjava/scraping/NullResult.java
new file mode 100644
index 00000000..c38ecb4a
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NullResult.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+import java.util.Iterator;
+import org.apache.commons.collections.IteratorUtils;
+
+public class NullResult implements Result {
+
+    public Iterator iterateRows() {
+        return IteratorUtils.EMPTY_ITERATOR;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/NullStore.java b/scraping-engine/src/java/org/osjava/scraping/NullStore.java
new file mode 100644
index 00000000..f960e912
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/NullStore.java
@@ -0,0 +1,24 @@
+package org.osjava.scraping;
+
+import java.util.Iterator;
+
+public class NullStore implements Store {
+
+    public void store(Result result, Config cfg, Session session) throws StoringException {
+        if(false) throw new StoringException(null,null);
+        Iterator iterator = result.iterateRows();
+        int i=0;
+        while(iterator.hasNext()) {
+            Object[] array = (Object[])iterator.next();
+            for(int j=0; j<array.length; j++) {
+                System.err.println("["+i+", "+j+"] = "+array[j]);
+            }
+            i++;
+        }
+    }
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException {
+        return false;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Page.java b/scraping-engine/src/java/org/osjava/scraping/Page.java
new file mode 100644
index 00000000..7d7649bd
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Page.java
@@ -0,0 +1,15 @@
+package org.osjava.scraping;
+
+import java.io.IOException;
+import java.io.Reader;
+
+// TODO: Have a page know its URI
+public interface Page {
+
+    public Reader read() throws IOException;
+    public String readAsString() throws IOException;
+    public Page fetch(String uri, Config cfg, Session session) throws FetchingException;
+
+    public void setDocumentBase(String documentBase);
+    public String getDocumentBase();
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Parser.java b/scraping-engine/src/java/org/osjava/scraping/Parser.java
new file mode 100644
index 00000000..098f01da
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Parser.java
@@ -0,0 +1,8 @@
+package org.osjava.scraping;
+
+public interface Parser {
+
+    public Result parse(Page page, Config cfg, Session session) throws ParsingException;
+    public void startUp(Config cfg) throws Exception;
+    public void bringDown(Config cfg) throws Exception;
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/ParserFactory.java b/scraping-engine/src/java/org/osjava/scraping/ParserFactory.java
new file mode 100644
index 00000000..256de05e
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/ParserFactory.java
@@ -0,0 +1,16 @@
+package org.osjava.scraping;
+
+import com.generationjava.lang.ClassW;
+
+public class ParserFactory {
+
+    static public Parser getParser(Config cfg, Session session) {
+        String parserClass = cfg.getString("parser");
+        if(parserClass == null) {
+            return new NullParser();
+        }
+        Parser parser = (Parser)ClassW.createObject(parserClass);
+        return parser;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/ParsingException.java b/scraping-engine/src/java/org/osjava/scraping/ParsingException.java
new file mode 100644
index 00000000..0c782f63
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/ParsingException.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+public class ParsingException extends Exception {
+
+    public ParsingException(String msg) {
+        super(msg);
+    }
+
+    public ParsingException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/QuartzJob.java b/scraping-engine/src/java/org/osjava/scraping/QuartzJob.java
new file mode 100644
index 00000000..6b3303e5
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/QuartzJob.java
@@ -0,0 +1,24 @@
+package org.osjava.scraping;
+
+import org.quartz.JobDetail;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.Job;
+
+public class QuartzJob implements Job {
+
+    public QuartzJob() {
+    }
+
+    public void execute(JobExecutionContext jec) throws JobExecutionException {
+        Scheduler sch = new SimpleScheduler();
+        JobDetail jd = jec.getJobDetail();
+        JobDataMap map = jd.getJobDataMap();
+        Config cfg = (Config)map.get("cfg");
+        Session session = (Session)map.get("session");
+        Runner runner = (Runner)map.get("runner");
+        sch.schedule(cfg, session, runner);
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/QuartzScheduler.java b/scraping-engine/src/java/org/osjava/scraping/QuartzScheduler.java
new file mode 100644
index 00000000..89eb166f
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/QuartzScheduler.java
@@ -0,0 +1,91 @@
+package org.osjava.scraping;
+
+import org.apache.commons.lang.StringUtils;
+
+import java.util.Date;
+
+import org.quartz.impl.StdSchedulerFactory;
+import org.quartz.JobDetail;
+import org.quartz.JobDataMap;
+import org.quartz.Job;
+//import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.Trigger;
+import org.quartz.CronTrigger;
+import org.quartz.SimpleTrigger;
+
+import java.text.ParseException;
+
+import org.apache.log4j.Logger;
+
+/// BEWARE: Name clash. Scheduler and org.quartz.Scheduler
+public class QuartzScheduler implements Scheduler {
+
+    private static Logger logger = Logger.getLogger(QuartzScheduler.class);
+
+    private org.quartz.Scheduler quartz;
+
+    public QuartzScheduler() {
+        try {
+            quartz = new StdSchedulerFactory().getScheduler();
+            quartz.start();
+        } catch(SchedulerException se) {
+            throw new RuntimeException("Failed to schedule job. " + se);
+        }
+    }
+
+    public void schedule(Config cfg, Session session, Runner runner) {
+        String schedule = cfg.getString("schedule");
+
+        // set default
+        if(StringUtils.isEmpty(schedule)) {
+            schedule = "startup";
+        } 
+
+        // this should be one of the following:
+        // a cron-like line or a 'startup' option 
+        if("startup".equalsIgnoreCase(schedule)) { 
+            Scheduler sch = new SimpleScheduler();
+            sch.schedule(cfg, session, runner);
+        } else {
+            // assume it's a cron statement
+            try {
+                JobDetail detail = new JobDetail(cfg.getContext()+"job",
+                    quartz.DEFAULT_GROUP, QuartzJob.class);
+                JobDataMap map = detail.getJobDataMap();
+                map.put("cfg", cfg);
+                map.put("session", session);
+                map.put("runner", runner);
+
+                logger.debug("SCHEDULE: "+schedule);
+                Trigger trigger = null;
+                if("cron".equalsIgnoreCase(schedule)) {
+                    String cronTxt = cfg.getString("schedule.cron");
+                    CronTrigger cron = new CronTrigger(cfg.getContext()+"trigger", quartz.DEFAULT_GROUP);
+                    cron.setCronExpression(cronTxt);
+                    trigger = cron;
+                } else {
+//                    Date start = cfg.getDate("start");
+//                    Date end = cfg.getDate("end");
+                    int repeat = cfg.getInt("schedule.repeat");
+                    if(repeat == -1) {
+                        repeat = SimpleTrigger.REPEAT_INDEFINITELY;
+                    }
+                    int interval = cfg.getInt("schedule.interval");
+                    logger.debug("Re:"+repeat);
+                    logger.debug("In:"+interval);
+                    SimpleTrigger simp = new SimpleTrigger(cfg.getContext()+"trigger",
+                    quartz.DEFAULT_GROUP, new Date(), null, repeat, interval);
+                    trigger = simp;
+                }
+
+                quartz.scheduleJob(detail, trigger);
+            } catch(ParseException pe) {
+                throw new RuntimeException("Failed to parse cron. " + pe);
+            } catch(SchedulerException se) {
+                throw new RuntimeException("Failed to schedule job. " + se);
+            }
+        }
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Result.java b/scraping-engine/src/java/org/osjava/scraping/Result.java
new file mode 100644
index 00000000..d0dc0276
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Result.java
@@ -0,0 +1,9 @@
+package org.osjava.scraping;
+
+import java.util.Iterator;
+
+public interface Result {
+
+    public Iterator iterateRows();
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Runner.java b/scraping-engine/src/java/org/osjava/scraping/Runner.java
new file mode 100644
index 00000000..847cec09
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Runner.java
@@ -0,0 +1,7 @@
+package org.osjava.scraping;
+
+public interface Runner {
+
+    public void run(Config cfg, Session session);
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Scheduler.java b/scraping-engine/src/java/org/osjava/scraping/Scheduler.java
new file mode 100644
index 00000000..385a92e8
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Scheduler.java
@@ -0,0 +1,7 @@
+package org.osjava.scraping;
+
+public interface Scheduler {
+
+    public void schedule(Config cfg, Session session, Runner runner);
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/SchedulerFactory.java b/scraping-engine/src/java/org/osjava/scraping/SchedulerFactory.java
new file mode 100644
index 00000000..2f1a13ae
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/SchedulerFactory.java
@@ -0,0 +1,27 @@
+package org.osjava.scraping;
+
+import org.osjava.scraping.util.FactoryUtils;
+import java.util.HashMap;
+
+public class SchedulerFactory {
+
+    static private HashMap cache = new HashMap();
+
+    static public Scheduler getScheduler(Config cfg, Session session) {
+        String name = cfg.getString("scheduler");
+        if(name == null) {
+            name = "Simple";
+        }
+        if(SchedulerFactory.cache.containsKey(name)) {
+            return (Scheduler)SchedulerFactory.cache.get(name);
+        }
+
+        Scheduler scheduler = (Scheduler)FactoryUtils.getObject(name, "Scheduler");
+        if(scheduler == null) {
+            throw new RuntimeException("Unable to find Scheduler. ");
+        }
+        SchedulerFactory.cache.put(name, scheduler);
+        return scheduler;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Session.java b/scraping-engine/src/java/org/osjava/scraping/Session.java
new file mode 100644
index 00000000..d717c543
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Session.java
@@ -0,0 +1,14 @@
+package org.osjava.scraping;
+
+import java.util.List;
+
+public interface Session extends Config {
+
+    public Object get(String key);
+    public String getString(String key);
+    public List getList(String key);
+    public Object remove(String key);
+
+    public void put(String key, Object value);
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/SimpleScheduler.java b/scraping-engine/src/java/org/osjava/scraping/SimpleScheduler.java
new file mode 100644
index 00000000..f3112472
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/SimpleScheduler.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+import org.apache.commons.lang.StringUtils;
+
+public class SimpleScheduler implements Scheduler {
+
+    public void schedule(Config cfg, Session session, Runner runner) {
+        // push a thread off
+        runner.run(cfg.cloneConfig(), session);
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/Store.java b/scraping-engine/src/java/org/osjava/scraping/Store.java
new file mode 100644
index 00000000..64e6c154
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/Store.java
@@ -0,0 +1,9 @@
+package org.osjava.scraping;
+
+public interface Store {
+
+    public void store(Result result, Config cfg, Session session) throws StoringException;
+
+    public boolean exists(Header header, Config cfg, Session session) throws StoringException;
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/StoreFactory.java b/scraping-engine/src/java/org/osjava/scraping/StoreFactory.java
new file mode 100644
index 00000000..98a6101b
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/StoreFactory.java
@@ -0,0 +1,16 @@
+package org.osjava.scraping;
+
+import org.osjava.scraping.util.FactoryUtils;
+
+public class StoreFactory {
+
+    static public Store getStore(Config cfg, Session session) {
+        String name = cfg.getString("store");
+        Store store = (Store)FactoryUtils.getObject(name, "Store");
+        if(store == null) {
+            throw new RuntimeException("Unable to find Store. ");
+        }
+        return store;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/StoringException.java b/scraping-engine/src/java/org/osjava/scraping/StoringException.java
new file mode 100644
index 00000000..1614325d
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/StoringException.java
@@ -0,0 +1,12 @@
+package org.osjava.scraping;
+
+public class StoringException extends Exception {
+
+    public StoringException(String msg) {
+        super(msg);
+    }
+
+    public StoringException(String msg, Throwable t) {
+        super(msg, t);
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/TabularResult.java b/scraping-engine/src/java/org/osjava/scraping/TabularResult.java
new file mode 100644
index 00000000..42d1b0f5
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/TabularResult.java
@@ -0,0 +1,20 @@
+package org.osjava.scraping;
+
+import java.util.Iterator;
+
+public class TabularResult implements Result {
+
+    private Iterator iterator;
+
+    public TabularResult(Iterator iterator) {
+        this.iterator = iterator;
+    }
+
+    // returns Iterator of <Object[]>.
+    // very simple system to start with 
+    // so our JdbcStore can be simple
+    public Iterator iterateRows() {
+        return this.iterator;
+    }
+
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/parser/PassThroughParser.java b/scraping-engine/src/java/org/osjava/scraping/parser/PassThroughParser.java
new file mode 100644
index 00000000..1f0590f4
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/parser/PassThroughParser.java
@@ -0,0 +1,20 @@
+package org.osjava.scraping.parser;
+
+import java.io.Reader;
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.util.ArrayList;
+import org.osjava.scraping.*;
+
+public class PassThroughParser extends AbstractParser {
+
+    public Result parse(Page page, Config cfg, Session session) throws ParsingException {
+        try {
+            ArrayList list = new ArrayList(1);
+            list.add( new Object[] { page.readAsString() } );
+            return new TabularResult(list.iterator());
+        } catch(IOException ioe) {
+            throw new ParsingException("Unable to read page", ioe);
+        }
+    }
+}
diff --git a/scraping-engine/src/java/org/osjava/scraping/util/FactoryUtils.java b/scraping-engine/src/java/org/osjava/scraping/util/FactoryUtils.java
new file mode 100644
index 00000000..2da49c43
--- /dev/null
+++ b/scraping-engine/src/java/org/osjava/scraping/util/FactoryUtils.java
@@ -0,0 +1,34 @@
+package org.osjava.scraping.util;
+
+import com.generationjava.lang.ClassW;
+
+public class FactoryUtils {
+
+    static private String NULL_NAME = "Null";
+
+    static public Object getObject(String name, String type) {
+        if(name != null) {
+            Object obj = ClassW.createObject("org.osjava.scraping."+name+type);
+            // should it check the type? it assumes we have a 
+            // clue what the interface is...
+            if(obj != null) {
+                return obj;
+            }
+            obj = ClassW.createObject(name+type);
+            if(obj != null) {
+                return obj;
+            }
+            obj = ClassW.createObject(name);
+            if(obj != null) {
+                return obj;
+            }
+        }
+        if(name == NULL_NAME) {
+            // if it couldn't find the Null pattern for the type
+            return null;
+        } else {
+            return getObject(NULL_NAME, type);
+        }
+    }
+
+}
diff --git a/trail-taglib/META-INF/taglib.tld b/trail-taglib/META-INF/taglib.tld
new file mode 100644
index 00000000..0ea76bfd
--- /dev/null
+++ b/trail-taglib/META-INF/taglib.tld
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+
+<taglib>
+  <tlibversion>1.0</tlibversion>
+  <jspversion>2.0</jspversion>
+  <shortname>trail</shortname>
+  <uri>http://www.osjava.org/taglibs/trail-1.0</uri>
+  <info>Breadcrumbs in a taglib. </info>
+  <tag>
+    <name>list</name>
+    <tagclass>org.osjava.taglib.trail.ListTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>var</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>delimiter</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>normalized</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>push</name>
+    <tagclass>org.osjava.taglib.trail.PushTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>label</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+    <attribute>
+      <name>url</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+  <tag>
+    <name>pop</name>
+    <tagclass>org.osjava.taglib.trail.PopTag</tagclass>
+    <bodycontent>JSP</bodycontent>
+    <attribute>
+      <name>label</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+    </attribute>
+  </tag>
+</taglib>
diff --git a/trail-taglib/runc.sh b/trail-taglib/runc.sh
new file mode 100755
index 00000000..e1de5b27
--- /dev/null
+++ b/trail-taglib/runc.sh
@@ -0,0 +1,2 @@
+javac -classpath .:servlet-api.jar:jsp-api.jar org/osjava/taglib/trail/*.java 
+jar cf trail-taglib-1.0.jar org/osjava/taglib/trail/*.class META-INF/taglib.tld
diff --git a/trail-taglib/src/java/org/osjava/taglib/trail/BreadCrumb.java b/trail-taglib/src/java/org/osjava/taglib/trail/BreadCrumb.java
new file mode 100644
index 00000000..5c5bcde1
--- /dev/null
+++ b/trail-taglib/src/java/org/osjava/taglib/trail/BreadCrumb.java
@@ -0,0 +1,31 @@
+package org.osjava.taglib.trail;
+
+public class BreadCrumb {
+    private String url;
+    private String label;
+
+    public BreadCrumb(String url, String label) {
+        this.url = url;
+        this.label = label;
+    }
+
+    public String getUrl() { return this.url; }
+    public String getLabel() { return this.label; }
+
+    public int hashCode() { return this.url.hashCode() & this.label.hashCode(); }
+
+    public boolean equals(Object obj) {
+        if( !(obj instanceof BreadCrumb) ) {
+            return false;
+        }
+
+        BreadCrumb b = (BreadCrumb) obj;
+
+        return this.url.equals(b.url) && this.label.equals(b.label);
+    }
+
+    public String toString() {
+        return "[" + this.label + "|" + this.url + "]";
+    }
+
+}
diff --git a/trail-taglib/src/java/org/osjava/taglib/trail/BreadCrumbs.java b/trail-taglib/src/java/org/osjava/taglib/trail/BreadCrumbs.java
new file mode 100644
index 00000000..481aac87
--- /dev/null
+++ b/trail-taglib/src/java/org/osjava/taglib/trail/BreadCrumbs.java
@@ -0,0 +1,54 @@
+package org.osjava.taglib.trail;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class BreadCrumbs {
+
+    private List trail = new ArrayList();
+    private List normalizedTrail = new ArrayList();
+
+    // needs lots of thought, this current version breaks after 
+    // the first norm
+
+    // i need to be able to look at the http-referer too
+    // if someone hits back once or twice etc, then chooses a 
+    // sibling, i have to be able to see that
+
+    // also have to fix the .do/.jsp problem. servlet filter?
+
+    public void addToTrail(BreadCrumb bc) {
+        trail.add(bc);
+
+        //    if crumb equals last crumb, do not add to norm
+        if( !normalizedTrail.isEmpty() ) {
+            BreadCrumb last = (BreadCrumb) normalizedTrail.get( normalizedTrail.size() - 1 );
+            if(bc.equals(last)) {
+                return;
+            }
+        }
+
+        //    if crumb can be found in the trail, remove all entries 
+        //      after the crumb, and don't add to norm
+        if(normalizedTrail.contains(bc)) {
+            int idx = normalizedTrail.indexOf(bc);
+            normalizedTrail = normalizedTrail.subList(0, idx + 1);
+            return;
+        }
+
+        //    if crumb's referrer can be found in the trail, remove 
+        //      all entries after the crumb's referrer, then add to norm
+
+        normalizedTrail.add( bc );
+    }
+
+    public Iterator iterateTrail() {
+        return trail.iterator();
+    } 
+
+    public Iterator iterateNormalizedTrail() {
+        return normalizedTrail.iterator();
+    }
+
+}
diff --git a/trail-taglib/src/java/org/osjava/taglib/trail/JspUtils.java b/trail-taglib/src/java/org/osjava/taglib/trail/JspUtils.java
new file mode 100644
index 00000000..e6886ac1
--- /dev/null
+++ b/trail-taglib/src/java/org/osjava/taglib/trail/JspUtils.java
@@ -0,0 +1,36 @@
+package org.osjava.taglib.trail;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.jsp.tagext.BodyContent;
+
+import javax.servlet.jsp.PageContext;
+import javax.servlet.http.HttpSession;
+
+class JspUtils {
+
+    public static String getBody(BodyContent bodyContent) {
+        String text = null;
+        if(bodyContent != null) {
+            StringWriter body = new StringWriter();
+            try {
+                bodyContent.writeOut(body);
+                text = body.toString().trim();
+            } catch(IOException ioe) {
+                // ignore, return null is the error
+            }
+        }
+        return text;
+    }
+
+    public static BreadCrumbs getBreadCrumbs(PageContext pageContext) {
+        HttpSession session = pageContext.getSession();
+        BreadCrumbs breadcrumbs = (BreadCrumbs) session.getAttribute("org.osjava.taglib.breadcrumbs");
+        if(breadcrumbs == null) {
+            breadcrumbs = new BreadCrumbs();
+            session.setAttribute("org.osjava.taglib.breadcrumbs", breadcrumbs);
+        }
+        return breadcrumbs;
+    }
+}
diff --git a/trail-taglib/src/java/org/osjava/taglib/trail/ListTag.java b/trail-taglib/src/java/org/osjava/taglib/trail/ListTag.java
new file mode 100644
index 00000000..9c8dfcf8
--- /dev/null
+++ b/trail-taglib/src/java/org/osjava/taglib/trail/ListTag.java
@@ -0,0 +1,72 @@
+package org.osjava.taglib.trail;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import java.util.Iterator;
+
+import javax.servlet.ServletRequest;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+// <trail:list/>
+// <trail:list normalized="false"/>
+public class ListTag extends TagSupport {
+
+    private String var;
+    private String delimiter = " -> ";
+    private String normalized;
+
+    public ListTag() {
+    }
+
+    public String getVar() { return this.var; }
+    public void setVar(String var) { this.var = var; }
+
+    public String getNormalized() { return this.normalized; }
+    public void setNormalized(String normalized) { this.normalized = normalized; }
+
+    public String getDelimiter() { return this.delimiter; }
+    public void setDelimiter(String delimiter) { this.delimiter = delimiter; }
+
+    public int doEndTag() throws JspException {
+        BreadCrumbs breadcrumbs = JspUtils.getBreadCrumbs(pageContext);
+
+        StringBuffer buffer = new StringBuffer();
+        Iterator itr = null;
+        // fix
+        if(this.normalized == null) {
+            itr = breadcrumbs.iterateNormalizedTrail();
+        } else {
+            itr = breadcrumbs.iterateTrail();
+        }
+        while( itr.hasNext() ) {
+            BreadCrumb breadcrumb = (BreadCrumb) itr.next();
+            Object label = breadcrumb.getLabel();
+            Object url = breadcrumb.getUrl();
+            buffer.append("<a href=\"");
+            buffer.append(url);
+            buffer.append("\">");
+            buffer.append(label);
+            buffer.append("</a>");
+            buffer.append(this.delimiter);
+        }
+        String txt = buffer.toString();
+
+        if(this.var == null) {
+            JspWriter writer = pageContext.getOut();
+            try {
+                writer.print(txt);
+            } catch(IOException ioe) {
+                throw new JspException(ioe.toString());
+            }
+        } else {
+            pageContext.setAttribute(this.var, txt);
+        }
+        return EVAL_PAGE;
+    }
+
+}
diff --git a/trail-taglib/src/java/org/osjava/taglib/trail/PopTag.java b/trail-taglib/src/java/org/osjava/taglib/trail/PopTag.java
new file mode 100644
index 00000000..77b804de
--- /dev/null
+++ b/trail-taglib/src/java/org/osjava/taglib/trail/PopTag.java
@@ -0,0 +1,32 @@
+package org.osjava.taglib.trail;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.ServletRequest;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+// <trail:pop label="??"/>
+public class PopTag extends TagSupport {
+
+    private String label;
+
+    public PopTag() {
+    }
+
+    public String getLabel() { return this.label; }
+    public void setLabel(String label) { this.label = label; }
+
+    public int doEndTag() throws JspException {
+        BreadCrumbs breadcrumbs = JspUtils.getBreadCrumbs(pageContext);
+
+        // find label, remove it and everything before....
+
+        return EVAL_PAGE;
+    }
+
+}
diff --git a/trail-taglib/src/java/org/osjava/taglib/trail/PushTag.java b/trail-taglib/src/java/org/osjava/taglib/trail/PushTag.java
new file mode 100644
index 00000000..569d4e92
--- /dev/null
+++ b/trail-taglib/src/java/org/osjava/taglib/trail/PushTag.java
@@ -0,0 +1,46 @@
+package org.osjava.taglib.trail;
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.http.HttpServletRequest;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+// <trail:push url="listMenu.jsp" label="Menu"/>
+// <trail:push label="Menu"/>
+public class PushTag extends TagSupport {
+
+    private String url;
+    private String label;
+
+    public PushTag() {
+    }
+
+    public String getLabel() { return this.label; }
+    public void setLabel(String label) { this.label = label; }
+
+    public String getUrl() { return this.url; }
+    public void setUrl(String url) { this.url = url; }
+
+    public int doEndTag() throws JspException {
+        BreadCrumbs breadcrumbs = JspUtils.getBreadCrumbs(pageContext);
+
+        String uri = this.url;
+        if(this.url == null) {
+            HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
+            // add query string
+            uri = request.getRequestURI();
+            uri += "?";
+            uri += request.getQueryString();
+        }
+
+        breadcrumbs.addToTrail( new BreadCrumb(uri, this.label) );
+
+        return EVAL_PAGE;
+    }
+
+}