diff --git a/tools/.classpath b/tools/.classpath
index a72e101441..752cdb0a2d 100644
--- a/tools/.classpath
+++ b/tools/.classpath
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry exported="true" kind="lib" path="lib/looks-2.0.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/c3p0-oracle-thin-extras-0.9.1.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jstl.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
@@ -67,20 +70,10 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/jpayment.jar">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/bsh-2.0b5.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="lib/c3p0-0.9.1.2.jar"/>
-	<classpathentry kind="lib" path="lib/ojdbc14.jar"/>
-	<classpathentry kind="lib" path="lib/postgresql.jar"/>
-	<classpathentry kind="lib" path="lib/looks-2.0.4.jar"/>
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/script-api.jar">
 		<attributes>
@@ -127,6 +120,20 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="../"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="lib/postgresql.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry exported="true" kind="lib" path="lib/ojdbc6.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.1.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/activemq-core-5.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-net-1.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ant-contrib-1.0b1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/xercesImpl.jar"/>
+	<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="output" path="build"/>
 </classpath>
diff --git a/tools/.project b/tools/.project
index c07aba19ce..abbcd00e45 100644
--- a/tools/.project
+++ b/tools/.project
@@ -15,11 +15,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>com.ibm.etools.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.pde.ManifestBuilder</name>
 			<arguments>
diff --git a/tools/META-INF/MANIFEST.MF b/tools/META-INF/MANIFEST.MF
index cb7201a8d1..1ff0f6bfb0 100644
--- a/tools/META-INF/MANIFEST.MF
+++ b/tools/META-INF/MANIFEST.MF
@@ -15,9 +15,7 @@ Bundle-ClassPath: tools.jar,
  lib/swingx-0.9.0.jar,
  lib/miglayout-3.7.1-swing.jar,
  lib/log4j.jar,
- lib/activation.jar,
  lib/mail.jar,
- lib/jpayment.jar,
  lib/bsh-2.0b5.jar,
  lib/script-api.jar,
  lib/bsh-engine.jar,
@@ -25,23 +23,17 @@ Bundle-ClassPath: tools.jar,
  lib/groovy-engine.jar,
  lib/jython.jar,
  lib/jython-engine.jar,
- lib/jcommon-1.0.14.jar,
- lib/jfreechart-1.0.11.jar,
  lib/javaee.jar,
  lib/c3p0-0.9.1.2.jar,
  lib/ant-commons-net.jar,
  lib/ant-contrib-1.0b1.jar,
  lib/ant-launcher.jar,
- lib/c3p0-oracle-thin-extras-0.9.1.2.jar,
  lib/cglib.jar,
  lib/commons-codec.jar,
  lib/commons-logging.jar,
  lib/jgraph.jar,
  lib/jsp-api.jar,
  lib/logkit.jar,
- lib/looks-2.0.4.jar,
- lib/ocrs12.jar,
- lib/ojdbc14.jar,
  lib/postgresql.jar,
  lib/wizard.jar,
  lib/xjavadoc-1.1.jar,
@@ -54,7 +46,13 @@ Bundle-ClassPath: tools.jar,
  lib/activemq-core-5.0.0.jar,
  lib/commons-net-1.4.0.jar,
  lib/cron4j-2.2.1.jar,
- lib/payflow.jar
+ lib/payflow.jar,
+ lib/ojdbc6.jar,
+ lib/c3p0-oracle-thin-extras-0.9.1.2.jar,
+ lib/jcommon-1.0.16.jar,
+ lib/jfreechart-1.0.13.jar,
+ lib/jpayment.jar,
+ lib/looks-2.0.4.jar
 Export-Package: Lib,
  Lib.email,
  Lib.encodings,
@@ -99,6 +97,7 @@ Export-Package: Lib,
    javax.swing.event,
    javax.swing.plaf,
    javax.swing",
+ com.jgoodies.looks.plastic.icons,
  com.jgoodies.looks.plastic.theme;uses:="com.jgoodies.looks.plastic,javax.swing.plaf,javax.swing",
  com.jgoodies.looks.windows;
   uses:="com.jgoodies.looks,
@@ -111,6 +110,8 @@ Export-Package: Lib,
    javax.swing.event,
    javax.swing.plaf,
    javax.swing",
+ com.jgoodies.looks.windows.icons,
+ com.jgoodies.looks.windows.icons.xp,
  com.keypoint,
  com.lowagie.text;uses:="com.lowagie.text.pdf.draw,com.lowagie.text.pdf",
  com.lowagie.text.exceptions,
@@ -144,7 +145,7 @@ Export-Package: Lib,
  com.lowagie.text.pdf.fonts.cmaps,
  com.lowagie.text.pdf.hyphenation;uses:="com.lowagie.text.xml.simpleparser",
  com.lowagie.text.pdf.interfaces;uses:="com.lowagie.text.pdf",
- com.lowagie.text.pdf.internal;uses:="com.lowagie.text.pdf.interfaces,com.lowagie.text.pdf,com.lowagie.text",
+ com.lowagie.text.pdf.internal;x-internal:=true;uses:="com.lowagie.text.pdf.interfaces,com.lowagie.text.pdf,com.lowagie.text",
  com.lowagie.text.pdf.parser;uses:="com.lowagie.text.pdf",
  com.lowagie.text.xml;
   uses:="org.xml.sax,
@@ -179,6 +180,7 @@ Export-Package: Lib,
    javax.naming,
    com.mchange.v2.log",
  com.mchange.v2.c3p0.cfg;uses:="com.mchange.v2.debug,com.mchange.v2.log,org.w3c.dom",
+ com.mchange.v2.c3p0.dbms,
  com.mchange.v2.c3p0.filter;uses:="com.mchange.v2.debug,javax.sql",
  com.mchange.v2.c3p0.impl;
   uses:="com.mchange.v2.sql.filter,
@@ -217,6 +219,7 @@ Export-Package: Lib,
    com.mchange.v2.sql.filter,
    javax.sql",
  com.mchange.v2.cfg;uses:="com.mchange.v2.debug,com.mchange.v2.log",
+ com.mchange.v2.cfg.junit,
  com.mchange.v2.coalesce;uses:="com.mchange.v2.debug,com.mchange.v1.identicator",
  com.mchange.v2.codegen;uses:="com.mchange.v2.debug,com.mchange.v2.io",
  com.mchange.v2.codegen.bean;
@@ -264,9 +267,8 @@ Export-Package: Lib,
    javax.net,
    com.sfcommerce.jpaymentcomponent.definitions,
    javax.net.ssl",
- com.sfcommerce.jpaymentcomponent.utilities;uses:="javax.servlet.http,com.sfcommerce.jpaymentcomponent.messages",
- com.sun.activation.registries,
- com.sun.activation.viewers;uses:="javax.activation",
+ com.sfcommerce.jpaymentcomponent.utilities;uses:="javax.activation",
+ com.sun.mail.auth,
  com.sun.mail.handlers;uses:="javax.activation",
  com.sun.mail.iap,
  com.sun.mail.imap;
@@ -286,6 +288,7 @@ Export-Package: Lib,
  com.sun.mail.pop3;uses:="javax.mail.internet,javax.mail",
  com.sun.mail.smtp;uses:="javax.mail.internet,javax.mail,com.sun.mail.util",
  com.sun.mail.util,
+ com.sun.mail.util.logging,
  com.sun.script.groovy;uses:="javax.script,groovy.lang",
  com.sun.script.jython;uses:="javax.script,org.python.core",
  com.ziclix.python.sql;uses:="org.python.core",
@@ -297,6 +300,7 @@ Export-Package: Lib,
  com.ziclix.python.sql.procedure;uses:="org.python.core,com.ziclix.python.sql",
  com.ziclix.python.sql.resource,
  com.ziclix.python.sql.util;uses:="org.python.core,com.ziclix.python.sql",
+ etc,
  groovy.inspect;uses:="groovy.lang",
  groovy.inspect.swingui;
   uses:="javax.swing.event,
@@ -411,6 +415,7 @@ Export-Package: Lib,
  groovyjarjarasm.asm.signature,
  groovyjarjarasm.asm.tree;uses:="groovyjarjarasm.asm",
  groovyjarjarcommonscli,
+ images,
  it.sauronsoftware.cron4j,
  javatests,
  javax.activation,
@@ -605,10 +610,28 @@ Export-Package: Lib,
  junit.framework,
  junit.runner,
  junit.swingui,
+ junit.swingui.icons,
  junit.textui,
  jxxload_help;uses:="org.python.core",
  net.miginfocom.layout,
  net.miginfocom.swing;uses:="net.miginfocom.layout",
+ net.sf.antcontrib,
+ net.sf.antcontrib.antclipse,
+ net.sf.antcontrib.antserver,
+ net.sf.antcontrib.antserver.client,
+ net.sf.antcontrib.antserver.commands,
+ net.sf.antcontrib.antserver.server,
+ net.sf.antcontrib.inifile,
+ net.sf.antcontrib.input,
+ net.sf.antcontrib.logic,
+ net.sf.antcontrib.logic.condition,
+ net.sf.antcontrib.net,
+ net.sf.antcontrib.perf,
+ net.sf.antcontrib.platform,
+ net.sf.antcontrib.process,
+ net.sf.antcontrib.property,
+ net.sf.antcontrib.util,
+ net.sf.antcontrib.walls,
  net.sourceforge.barbecue;
   uses:="javax.servlet.http,
    javax.portlet,
@@ -648,6 +671,7 @@ Export-Package: Lib,
    javax.security.auth,
    javax.sql",
  oracle.jdbc.dcn;uses:="oracle.jdbc,oracle.sql",
+ oracle.jdbc.diagnostics,
  oracle.jdbc.driver;
   uses:="oracle.jdbc.internal,
    oracle.net.ns,
@@ -661,7 +685,7 @@ Export-Package: Lib,
    oracle.jdbc,
    oracle.sql,
    oracle.jdbc.xa.client",
- oracle.jdbc.internal;
+ oracle.jdbc.internal;x-internal:=true;
   uses:="oracle.jdbc,
    oracle.jdbc.oracore,
    oracle.sql,
@@ -697,17 +721,14 @@ Export-Package: Lib,
    javax.transaction.xa,
    oracle.jdbc.xa,
    javax.sql",
- oracle.jpub.runtime;
-  uses:="oracle.jdbc,
-   oracle.jdbc.internal,
-   oracle.jdbc.driver,
-   oracle.sql",
- oracle.net.TNSAddress;uses:="oracle.net.nl",
+ oracle.jpub.runtime;uses:="oracle.net.nl",
  oracle.net.ano;uses:="oracle.net.ns,oracle.net.aso",
  oracle.net.aso,
+ oracle.net.jdbc.TNSAddress,
+ oracle.net.jdbc.nl,
+ oracle.net.jdbc.nl.mesg,
  oracle.net.jndi;uses:="javax.naming.directory,javax.net,javax.net.ssl",
- oracle.net.nl,
- oracle.net.nl.mesg,
+ oracle.net.mesg,
  oracle.net.ns;uses:="oracle.net.ano,oracle.net.nt",
  oracle.net.nt;uses:="javax.net.ssl",
  oracle.net.resolver;uses:="oracle.net.TNSAddress,oracle.net.nt",
@@ -720,6 +741,7 @@ Export-Package: Lib,
    oracle.jdbc.driver,
    oracle.sql.converter",
  oracle.sql.converter;uses:="oracle.jdbc.internal,oracle.i18n.text,oracle.i18n.text.converter",
+ oracle.sql.converter_xcharset,
  org.apache.activemq,
  org.apache.activemq.advisory,
  org.apache.activemq.blob,
@@ -981,10 +1003,12 @@ Export-Package: Lib,
  org.apache.taglibs.standard.tei;uses:="javax.servlet.jsp.tagext",
  org.apache.taglibs.standard.tlv;uses:="org.xml.sax,javax.servlet.jsp.tagext,org.xml.sax.helpers",
  org.apache.tools.ant,
+ org.apache.tools.ant.dispatch,
  org.apache.tools.ant.filters,
  org.apache.tools.ant.filters.util,
  org.apache.tools.ant.helper,
  org.apache.tools.ant.input,
+ org.apache.tools.ant.launch,
  org.apache.tools.ant.listener,
  org.apache.tools.ant.loader,
  org.apache.tools.ant.taskdefs,
@@ -992,11 +1016,17 @@ Export-Package: Lib,
  org.apache.tools.ant.taskdefs.condition,
  org.apache.tools.ant.taskdefs.cvslib,
  org.apache.tools.ant.taskdefs.email,
+ org.apache.tools.ant.taskdefs.optional.net,
  org.apache.tools.ant.taskdefs.rmic,
  org.apache.tools.ant.types,
+ org.apache.tools.ant.types.conditions,
  org.apache.tools.ant.types.mappers,
+ org.apache.tools.ant.types.resources,
+ org.apache.tools.ant.types.resources.comparators,
+ org.apache.tools.ant.types.resources.selectors,
  org.apache.tools.ant.types.selectors,
  org.apache.tools.ant.types.selectors.modifiedselector,
+ org.apache.tools.ant.types.spi,
  org.apache.tools.ant.util,
  org.apache.tools.ant.util.facade,
  org.apache.tools.ant.util.regexp,
@@ -1160,158 +1190,6 @@ 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;
-  uses:="org.jdesktop.swingx.event,
-   org.jdesktop.swingx.multislider,
-   javax.swing.undo,
-   javax.swing.tree,
-   org.jdesktop.swingx.table,
-   javax.swing.table,
-   new org.jdesktop.swingx,
-   org.jdesktop.swingx.painter,
-   org.jdesktop.swingx.treetable,
-   org.jdesktop.swingx.tips,
-   org.jdesktop.swingx.calendar,
-   javax.swing,
-   org.apache.batik.ext.awt,
-   javax.swing.text,
-   org.jdesktop.swingx.error,
-   org.jdesktop.swingx.auth,
-   javax.swing.border,
-   org.jdesktop.swingx.decorator,
-   javax.swing.event,
-   org.jdesktop.swingx.action,
-   org.jdesktop.beans,
-   javax.swing.text.html,
-   javax.swing.plaf,
-   javax.accessibility,
-   org.jdesktop.swingx.plaf,
-   org.jdesktop.swingx.color",
- org.jdesktop.swingx.action;uses:="org.jdesktop.swingx,javax.swing",
- org.jdesktop.swingx.auth;
-  uses:="new org.jdesktop.swingx.auth,
-   org.jdesktop.beans,
-   org.jdesktop.swingworker,
-   javax.security.auth.callback",
- org.jdesktop.swingx.auth.resources,
- org.jdesktop.swingx.autocomplete;
-  uses:="javax.swing.event,
-   javax.swing.text,
-   javax.swing.table,
-   javax.swing",
- org.jdesktop.swingx.autocomplete.workarounds;uses:="javax.swing",
- org.jdesktop.swingx.border;uses:="javax.swing.border,javax.swing",
- org.jdesktop.swingx.calendar;uses:="org.jdesktop.swingx.plaf,org.jdesktop.swingx,javax.swing",
- org.jdesktop.swingx.calendar.resources,
- org.jdesktop.swingx.color;
-  uses:="org.jdesktop.swingx.multislider,
-   org.apache.batik.ext.awt,
-   org.jdesktop.swingx,
-   javax.swing.colorchooser,
-   javax.swing.event,
-   javax.swing",
- org.jdesktop.swingx.combobox;uses:="javax.swing.event,javax.swing",
- org.jdesktop.swingx.decorator;
-  uses:="org.jdesktop.swingx.event,
-   javax.swing.event,
-   org.jdesktop.swingx.painter,
-   javax.swing",
- org.jdesktop.swingx.editors;
-  uses:="org.jdesktop.swingx.decorator,
-   org.jdesktop.swingx,
-   javax.swing.event,
-   org.jdesktop.swingx.painter,
-   javax.swing",
- org.jdesktop.swingx.error,
- org.jdesktop.swingx.event;uses:="javax.swing.event",
- org.jdesktop.swingx.geom,
- org.jdesktop.swingx.graphics,
- org.jdesktop.swingx.icon;uses:="javax.swing.plaf,javax.swing",
- org.jdesktop.swingx.image;uses:="org.jdesktop.beans",
- org.jdesktop.swingx.multislider;uses:="org.jdesktop.swingx,javax.swing",
- org.jdesktop.swingx.multisplitpane;uses:="org.jdesktop.swingx",
- org.jdesktop.swingx.painter;
-  uses:="org.jdesktop.swingx.editors,
-   org.jdesktop.swingx.painter.effects,
-   org.jdesktop.beans,
-   org.jdesktop.swingx,
-   javax.swing",
- org.jdesktop.swingx.painter.effects;uses:="org.jdesktop.swingx.editors,org.jdesktop.swingx.painter,org.jdesktop.swingx",
- org.jdesktop.swingx.plaf;
-  uses:="javax.swing.text,
-   org.jdesktop.swingx.painter,
-   javax.swing.plaf,
-   org.jdesktop.swingx,
-   javax.swing",
- org.jdesktop.swingx.plaf.basic;
-  uses:="org.jdesktop.swingx.event,
-   javax.swing.plaf.basic,
-   javax.swing.text,
-   org.jdesktop.swingx.error,
-   javax.swing.border,
-   org.jdesktop.swingx,
-   javax.swing.event,
-   org.jdesktop.swingx.painter,
-   org.jdesktop.swingx.action,
-   javax.swing.text.html,
-   javax.swing.plaf,
-   org.jdesktop.swingx.calendar,
-   org.jdesktop.swingx.plaf,
-   javax.swing",
- org.jdesktop.swingx.plaf.basic.resources,
- org.jdesktop.swingx.plaf.linux;uses:="org.jdesktop.swingx.plaf.basic",
- org.jdesktop.swingx.plaf.macosx;
-  uses:="org.jdesktop.swingx.plaf.basic,
-   org.jdesktop.swingx.painter,
-   org.jdesktop.swingx.action,
-   javax.swing.plaf,
-   org.jdesktop.swingx.plaf,
-   javax.swing",
- org.jdesktop.swingx.plaf.metal;
-  uses:="org.jdesktop.swingx.plaf.basic,
-   javax.swing.border,
-   javax.swing.plaf,
-   org.jdesktop.swingx,
-   javax.swing",
- org.jdesktop.swingx.plaf.misc;
-  uses:="org.jdesktop.swingx.plaf.basic,
-   javax.swing.border,
-   javax.swing.plaf,
-   org.jdesktop.swingx,
-   javax.swing",
- org.jdesktop.swingx.plaf.motif;uses:="org.jdesktop.swingx.plaf.basic",
- org.jdesktop.swingx.plaf.nimbus;uses:="org.jdesktop.swingx.plaf.basic",
- org.jdesktop.swingx.plaf.resources,
- org.jdesktop.swingx.plaf.windows;
-  uses:="org.jdesktop.swingx.plaf.basic,
-   javax.swing.border,
-   javax.swing.plaf,
-   org.jdesktop.swingx,
-   javax.swing",
- org.jdesktop.swingx.plaf.windows.resources,
- org.jdesktop.swingx.renderer;
-  uses:="javax.swing.tree,
-   javax.swing.table,
-   javax.swing.border,
-   org.jdesktop.swingx,
-   org.jdesktop.swingx.painter,
-   org.jdesktop.swingx.action,
-   javax.swing",
- org.jdesktop.swingx.resources,
- org.jdesktop.swingx.table;
-  uses:="javax.swing.tree,
-   javax.swing.table,
-   org.jdesktop.swingx,
-   javax.swing.event,
-   org.jdesktop.swingx.action,
-   javax.swing.plaf,
-   javax.swing",
- org.jdesktop.swingx.table.resources,
- org.jdesktop.swingx.tips,
- org.jdesktop.swingx.tree;uses:="javax.swing.tree,javax.swing",
- org.jdesktop.swingx.treetable;uses:="javax.swing.event,javax.swing.tree,javax.swing",
- org.jdesktop.swingx.util;uses:="javax.swing.border,javax.swing",
  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",
@@ -1387,6 +1265,7 @@ Export-Package: Lib,
    org.jfree.ui,
    org.jfree.data.contour",
  org.jfree.chart.needle,
+ org.jfree.chart.panel,
  org.jfree.chart.plot;
   uses:="org.jfree.util,
    org.jfree.chart.needle,
@@ -1553,12 +1432,15 @@ Export-Package: Lib,
  org.jpedal.examples.jpaneldemo,
  org.jpedal.examples.printing,
  org.jpedal.examples.simpleviewer,
+ org.jpedal.examples.simpleviewer.annots,
  org.jpedal.examples.simpleviewer.gui,
  org.jpedal.examples.simpleviewer.gui.generic,
  org.jpedal.examples.simpleviewer.gui.popups,
  org.jpedal.examples.simpleviewer.gui.swing,
  org.jpedal.examples.simpleviewer.paper,
+ org.jpedal.examples.simpleviewer.res,
  org.jpedal.examples.simpleviewer.utils,
+ org.jpedal.examples.tablezoning,
  org.jpedal.examples.text,
  org.jpedal.examples.text.extractheadlines,
  org.jpedal.exception,
@@ -1570,6 +1452,7 @@ Export-Package: Lib,
  org.jpedal.grouping,
  org.jpedal.gui,
  org.jpedal.images,
+ org.jpedal.international,
  org.jpedal.io,
  org.jpedal.objects,
  org.jpedal.objects.acroforms,
@@ -1578,6 +1461,9 @@ Export-Package: Lib,
  org.jpedal.objects.structuredtext,
  org.jpedal.parser,
  org.jpedal.render,
+ org.jpedal.res.cmm,
+ org.jpedal.res.pdf,
+ org.jpedal.res.pdf.defaults,
  org.jpedal.storypad,
  org.jpedal.sun,
  org.jpedal.utils,
diff --git a/tools/build.properties b/tools/build.properties
index 8f19b5c9eb..a1f1717f96 100644
--- a/tools/build.properties
+++ b/tools/build.properties
@@ -10,9 +10,7 @@ bin.includes = META-INF/,\
                lib/swingx-0.9.0.jar,\
                lib/miglayout-3.7.1-swing.jar,\
                lib/log4j.jar,\
-               lib/activation.jar,\
                lib/mail.jar,\
-               lib/jpayment.jar,\
                lib/bsh-2.0b5.jar,\
                lib/script-api.jar,\
                lib/bsh-engine.jar,\
@@ -20,15 +18,12 @@ bin.includes = META-INF/,\
                lib/groovy-engine.jar,\
                lib/jython.jar,\
                lib/jython-engine.jar,\
-               lib/jcommon-1.0.14.jar,\
-               lib/jfreechart-1.0.11.jar,\
                lib/javaee.jar,\
                tools.jar,\
                lib/ant-commons-net.jar,\
                lib/ant-contrib-1.0b1.jar,\
                lib/ant-launcher.jar,\
                lib/c3p0-0.9.1.2.jar,\
-               lib/c3p0-oracle-thin-extras-0.9.1.2.jar,\
                lib/cglib.jar,\
                lib/commons-codec.jar,\
                lib/commons-logging.jar,\
@@ -36,9 +31,6 @@ bin.includes = META-INF/,\
                lib/jgraph.jar,\
                lib/jsp-api.jar,\
                lib/logkit.jar,\
-               lib/looks-2.0.4.jar,\
-               lib/ocrs12.jar,\
-               lib/ojdbc14.jar,\
                lib/postgresql.jar,\
                lib/wizard.jar,\
                lib/xjavadoc-1.1.jar,\
@@ -51,4 +43,10 @@ bin.includes = META-INF/,\
                lib/activemq-core-5.0.0.jar,\
                lib/commons-net-1.4.0.jar,\
                lib/cron4j-2.2.1.jar,\
-               lib/payflow.jar
+               lib/payflow.jar,\
+               lib/ojdbc6.jar,\
+               lib/c3p0-oracle-thin-extras-0.9.1.2.jar,\
+               lib/jcommon-1.0.16.jar,\
+               lib/jfreechart-1.0.13.jar,\
+               lib/jpayment.jar,\
+               lib/looks-2.0.4.jar