diff --git a/tools/.classpath b/tools/.classpath
index 752cdb0a2d..8a76eab9a4 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -135,5 +135,12 @@
 	<classpathentry exported="true" kind="lib" path="lib/jpedal.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant-commons-net.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/ant-launcher.jar"/>
+	<classpathentry kind="lib" path="lib/cglib.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
+	<classpathentry kind="lib" path="lib/logkit.jar"/>
+	<classpathentry kind="lib" path="lib/jgraph.jar"/>
+	<classpathentry kind="lib" path="lib/wizard.jar"/>
+	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/tools/META-INF/MANIFEST.MF b/tools/META-INF/MANIFEST.MF
index 1ff0f6bfb0..0e2eafd07a 100644
--- a/tools/META-INF/MANIFEST.MF
+++ b/tools/META-INF/MANIFEST.MF
@@ -52,7 +52,8 @@ Bundle-ClassPath: tools.jar,
  lib/jcommon-1.0.16.jar,
  lib/jfreechart-1.0.13.jar,
  lib/jpayment.jar,
- lib/looks-2.0.4.jar
+ lib/looks-2.0.4.jar,
+ lib/swingx-1.6.jar
 Export-Package: Lib,
  Lib.email,
  Lib.encodings,
@@ -632,6 +633,15 @@ Export-Package: Lib,
  net.sf.antcontrib.property,
  net.sf.antcontrib.util,
  net.sf.antcontrib.walls,
+ net.sf.cglib.asm,
+ net.sf.cglib.asm.signature,
+ net.sf.cglib.beans,
+ net.sf.cglib.core,
+ net.sf.cglib.proxy,
+ net.sf.cglib.reflect,
+ net.sf.cglib.transform,
+ net.sf.cglib.transform.impl,
+ net.sf.cglib.util,
  net.sourceforge.barbecue;
   uses:="javax.servlet.http,
    javax.portlet,
@@ -816,6 +826,11 @@ Export-Package: Lib,
  org.apache.activemq.util,
  org.apache.activemq.wireformat,
  org.apache.activemq.xbean,
+ org.apache.commons.codec,
+ org.apache.commons.codec.binary,
+ org.apache.commons.codec.digest,
+ org.apache.commons.codec.language,
+ org.apache.commons.codec.net,
  org.apache.commons.collections,
  org.apache.commons.collections.bag,
  org.apache.commons.collections.bidimap,
@@ -828,6 +843,8 @@ Export-Package: Lib,
  org.apache.commons.collections.list,
  org.apache.commons.collections.map,
  org.apache.commons.collections.set,
+ org.apache.commons.logging,
+ org.apache.commons.logging.impl,
  org.apache.commons.net,
  org.apache.commons.net.bsd,
  org.apache.commons.net.ftp,
@@ -846,6 +863,17 @@ Export-Package: Lib,
  org.apache.ecs.xhtml;uses:="org.apache.ecs",
  org.apache.ecs.xml;uses:="org.apache.ecs",
  org.apache.html.dom,
+ org.apache.log,
+ org.apache.log.filter,
+ org.apache.log.format,
+ org.apache.log.output,
+ org.apache.log.output.db,
+ org.apache.log.output.io,
+ org.apache.log.output.io.rotate,
+ org.apache.log.output.jms,
+ org.apache.log.output.lf5,
+ org.apache.log.output.net,
+ org.apache.log.util,
  org.apache.log4j;uses:="org.apache.log4j.or,org.apache.log4j.spi,org.apache.log4j.helpers",
  org.apache.log4j.chainsaw;
   uses:="javax.swing.event,
@@ -1070,6 +1098,7 @@ Export-Package: Lib,
  org.apache.xerces.xs,
  org.apache.xerces.xs.datatypes,
  org.apache.xml.serialize,
+ org.apache.xmlcommons,
  org.codehaus.groovy,
  org.codehaus.groovy.ant;
   uses:="groovyjarjarasm.asm.tree,
@@ -1190,6 +1219,52 @@ Export-Package: Lib,
  org.codehaus.groovy.vmplugin;uses:="org.codehaus.groovy.ast",
  org.codehaus.groovy.vmplugin.v4;uses:="org.codehaus.groovy.vmplugin,org.codehaus.groovy.ast",
  org.codehaus.groovy.vmplugin.v5;uses:="org.codehaus.groovy.vmplugin,org.codehaus.groovy.ast",
+ org.jdesktop.beans,
+ org.jdesktop.swingx,
+ org.jdesktop.swingx.action,
+ org.jdesktop.swingx.auth,
+ org.jdesktop.swingx.autocomplete,
+ org.jdesktop.swingx.autocomplete.workarounds,
+ org.jdesktop.swingx.border,
+ org.jdesktop.swingx.calendar,
+ org.jdesktop.swingx.color,
+ org.jdesktop.swingx.combobox,
+ org.jdesktop.swingx.decorator,
+ org.jdesktop.swingx.error,
+ org.jdesktop.swingx.event,
+ org.jdesktop.swingx.geom,
+ org.jdesktop.swingx.graphics,
+ org.jdesktop.swingx.hyperlink,
+ org.jdesktop.swingx.icon,
+ org.jdesktop.swingx.image,
+ org.jdesktop.swingx.multislider,
+ org.jdesktop.swingx.multisplitpane,
+ org.jdesktop.swingx.painter,
+ org.jdesktop.swingx.painter.effects,
+ org.jdesktop.swingx.plaf,
+ org.jdesktop.swingx.plaf.basic,
+ org.jdesktop.swingx.plaf.basic.core,
+ org.jdesktop.swingx.plaf.basic.resources,
+ org.jdesktop.swingx.plaf.linux,
+ org.jdesktop.swingx.plaf.linux.resources,
+ org.jdesktop.swingx.plaf.macosx,
+ org.jdesktop.swingx.plaf.macosx.resources,
+ org.jdesktop.swingx.plaf.metal,
+ org.jdesktop.swingx.plaf.misc,
+ org.jdesktop.swingx.plaf.motif,
+ org.jdesktop.swingx.plaf.nimbus,
+ org.jdesktop.swingx.plaf.synth,
+ org.jdesktop.swingx.plaf.windows,
+ org.jdesktop.swingx.plaf.windows.resources,
+ org.jdesktop.swingx.renderer,
+ org.jdesktop.swingx.rollover,
+ org.jdesktop.swingx.search,
+ org.jdesktop.swingx.sort,
+ org.jdesktop.swingx.table,
+ org.jdesktop.swingx.tips,
+ org.jdesktop.swingx.tree,
+ org.jdesktop.swingx.treetable,
+ org.jdesktop.swingx.util,
  org.jfree;uses:="org.jfree.ui.about",
  org.jfree.base;uses:="org.jfree.util,org.jfree.base.modules,org.jfree.base.config",
  org.jfree.base.config;uses:="org.jfree.util",
@@ -1422,6 +1497,12 @@ Export-Package: Lib,
  org.jfree.ui.action;uses:="javax.swing",
  org.jfree.ui.tabbedui;uses:="javax.swing",
  org.jfree.util;uses:="org.jfree.base.config,org.jfree.ui,javax.swing",
+ org.jgraph,
+ org.jgraph.event,
+ org.jgraph.graph,
+ org.jgraph.plaf,
+ org.jgraph.plaf.basic,
+ org.jgraph.util,
  org.jpedal,
  org.jpedal.color,
  org.jpedal.examples,
@@ -1468,6 +1549,10 @@ Export-Package: Lib,
  org.jpedal.sun,
  org.jpedal.utils,
  org.jpedal.utils.repositories,
+ org.netbeans.api.wizard,
+ org.netbeans.api.wizard.displayer,
+ org.netbeans.modules.wizard,
+ org.netbeans.spi.wizard,
  org.postgresql;uses:="org.postgresql.largeobject,org.postgresql.fastpath,org.postgresql.copy",
  org.postgresql.copy;uses:="org.postgresql.core,org.postgresql",
  org.postgresql.core;uses:="org.postgresql.jdbc2,org.postgresql.copy,org.postgresql",
@@ -1534,5 +1619,15 @@ Export-Package: Lib,
    org.apache.tools.ant.types,
    org.python.core,
    jline",
+ org.w3c.dom.bootstrap,
+ org.w3c.dom.css,
+ org.w3c.dom.events,
  org.w3c.dom.html,
+ org.w3c.dom.ls,
+ org.w3c.dom.ranges,
+ org.w3c.dom.stylesheets,
+ org.w3c.dom.traversal,
+ org.w3c.dom.views,
+ org.w3c.dom.xpath,
+ org.xml.sax.ext,
  paypal.payflow
diff --git a/tools/build.properties b/tools/build.properties
index a1f1717f96..c3afe3c611 100644
--- a/tools/build.properties
+++ b/tools/build.properties
@@ -49,4 +49,5 @@ bin.includes = META-INF/,\
                lib/jcommon-1.0.16.jar,\
                lib/jfreechart-1.0.13.jar,\
                lib/jpayment.jar,\
-               lib/looks-2.0.4.jar
+               lib/looks-2.0.4.jar,\
+               lib/swingx-1.6.jar