--- batik-1.10/build.xml	2020-03-16 12:23:59.250010916 +0100
+++ batik-1.10/build.xml	2020-03-16 13:18:00.196538358 +0100
@@ -1016,9 +1016,11 @@
                                awt-util-jar,
                                gui-util-jar,
                                dom-jar,
+                               constants-jar,
                                css-jar,
                                svg-dom-jar,
                                gvt-jar,
+                               i18n-jar,
                                parser-jar,
                                script-jar,
                                transcoder-jar,
@@ -1029,8 +1031,10 @@
                                extension-jar,
                                xml-jar,
                                root-jar,
+                               svgbrowser-jar,
                                svg-pp-jar,
                                svggen-jar,
+                               svgrasterizer-jar,
                                svg-slideshow-jar,
                                squiggle-jar,
                                squiggle-ext-jar,
@@ -1298,12 +1302,24 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik external code"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-ext"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.ext"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.w3c.dom;uses:=&quot;org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.w3c.dom.events;uses:=&quot;org.w3c.dom,org.w3c.dom.events,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;,org.w3c.dom.events;uses:=&quot;org.w3c.dom,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.w3c.dom,org.w3c.dom.events,org.w3c.dom.views"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${lib}">
         <include name="LICENSE.dom-*.txt"/>
       </metainf>
       <fileset dir="${dest}">
         <include name="org/w3c/**"/>
+        <include name="${package-prefix}/w3c/**"/>
       </fileset>
     </jar>
   </target>
@@ -1316,6 +1332,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik utility library"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-util"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.util"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.i18n;version=&quot;${completeVersion}&quot;,org.apache.batik.util;version=&quot;${completeVersion}&quot;;uses:=&quot;org.apache.batik.i18n,org.apache.batik.util.resources&quot;,org.apache.batik.util.resources;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.util.io;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.resources"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1341,6 +1368,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik AWT utilities"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-awt-util"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.awt-util"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.ext.swing;uses:=&quot;javax.swing,javax.swing.text,org.apache.batik.i18n,org.apache.batik.util.resources&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.geom;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.font;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image;uses:=&quot;org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.spi;uses:=&quot;org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.util,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.renderable;uses:=&quot;org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.rendered,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.rendered;uses:=&quot;org.apache.batik.ext.awt.image,org.apache.batik.util,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.g2d;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.color;uses:=&quot;org.apache.batik.util,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.text,org.apache.batik.ext.awt,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.resources,org.apache.xmlgraphics.java2d.color"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1365,6 +1403,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik image codecs"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-codec"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.codec"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.ext.awt.image.codec.util;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.codec.imageio;uses:=&quot;javax.imageio,javax.imageio.event,javax.imageio.metadata,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.spi,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.codec.png;uses:=&quot;org.apache.batik.ext.awt.image.codec.util,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.jpeg,javax.imageio.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.batik.bridge,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.codec.util,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.i18n,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util,org.w3c.dom"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1393,6 +1442,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik Java2D SVG generator"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svggen"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svggen"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.svggen;uses:=&quot;javax.swing,org.apache.batik.ext.awt.g2d,org.apache.batik.util,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.svggen.font;uses:=&quot;org.apache.batik.i18n,org.apache.batik.svggen.font.table,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.svggen.font.table;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.plaf,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.image.spi,org.apache.batik.i18n,org.apache.batik.svggen.font.table,org.apache.batik.util,org.w3c.dom"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1404,6 +1464,65 @@
     </jar>
   </target>
 
+  <target name="svgbrowser-jar" depends="init, compile, prepare-build">
+    <jar jarfile="${build}/lib/${project}-svgbrowser-${completeVersion}.jar">
+      <manifest>
+        <attribute name="Implementation-Title" value="Batik SVG Browser Application Library"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
+        <attribute name="Implementation-Vendor" value="${vendor}"/>
+        <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik SVG Browser Application Library"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svgbrowser"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgbrowser"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.apps.svgbrowser;uses:=&quot;javax.swing,javax.swing.event,javax.swing.filechooser,javax.swing.table,javax.swing.tree,javax.xml.transform,org.apache.batik.bridge,org.apache.batik.ext.swing,org.apache.batik.gvt,org.apache.batik.i18n,org.apache.batik.swing,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.util,org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor,org.apache.batik.util.resources,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.table,javax.swing.text,javax.swing.tree,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.batik,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.dom,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.swing,org.apache.batik.gvt,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.swing,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.transcoder.print,org.apache.batik.transcoder.svg2svg,org.apache.batik.util,org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor,org.apache.batik.util.resources,org.apache.batik.xml,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg,org.xml.sax"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
+      </manifest>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <fileset dir="${dest}">
+        <include name="${package-prefix}/apps/svgbrowser/**/*.class"/>
+      </fileset>
+      <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
+        <include name="${package-prefix}/apps/svgbrowser/resources/*"/>
+        <include name="META-INF/services/org.apache.batik.apps.svgbrowser.SquiggleInputHandler"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="svgrasterizer-jar" depends="init, compile, prepare-build">
+    <jar jarfile="${build}/lib/${project}-svgrasterizer-${completeVersion}.jar">
+      <manifest>
+        <attribute name="Implementation-Title" value="Batik SVG Rasterizer Library"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
+        <attribute name="Implementation-Vendor" value="${vendor}"/>
+        <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik SVG Rasterizer Library"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svgrasterizer"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgrasterizer"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.apps.rasterizer;uses:=&quot;org.apache.batik.i18n,org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
+      </manifest>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <fileset dir="${dest}">
+        <include name="${package-prefix}/apps/rasterizer/**/*.class"/>
+      </fileset>
+      <fileset dir="batik-svgrasterizer/src/main/resources" excludes="**/.svn/">
+        <include name="${package-prefix}/apps/rasterizer/resources/*"/>
+      </fileset>
+    </jar>
+  </target>
+
   <!-- SVGGraphics2D (dependencies: util, awt-util) -->
   <target name="svggen-full-jar" depends="init, compile, prepare-build">
     <jar jarfile="${build}/lib/${project}-svggenfull-${completeVersion}.jar">
@@ -1436,6 +1555,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik GUI utilities"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-gui-util"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.util.gui"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.util.gui;uses:=&quot;javax.swing,javax.swing.event,javax.swing.filechooser,org.apache.batik.util.gui.resource,org.apache.batik.util.resources&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.util.gui.resource;uses:=&quot;javax.swing,org.apache.batik.util.resources&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.util.gui.xmleditor;uses:=&quot;javax.swing,javax.swing.text,javax.swing.undo&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.text,javax.swing.undo,org.apache.batik.util.gui.resource,org.apache.batik.util.resources,org.apache.batik.xml"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1456,6 +1586,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik DOM implementation"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-dom"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.dom"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.dom;uses:=&quot;javax.xml.transform,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.xbl,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.w3c.dom,org.apache.xml.utils,org.apache.xpath,org.apache.xpath.objects,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.w3c.dom.xpath&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.util;uses:=&quot;org.apache.batik.util,org.apache.batik.xml,org.w3c.dom,org.w3c.dom.css,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.events;uses:=&quot;org.apache.batik.dom,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.w3c.dom.events,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.xbl;uses:=&quot;org.w3c.dom,org.w3c.dom.events&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.traversal;uses:=&quot;org.apache.batik.dom,org.w3c.dom,org.w3c.dom.traversal&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.xml.parsers,javax.xml.transform,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.w3c.dom,org.apache.batik.w3c.dom.events,org.apache.batik.xml,org.apache.xml.utils,org.apache.xpath,org.apache.xpath.objects,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.w3c.dom.xpath,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1484,6 +1625,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik CSS engine"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-css"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.css"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.css.dom;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.svg,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.sac;uses:=&quot;org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine;uses:=&quot;org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.i18n,org.apache.batik.util,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.events&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.i18n,org.apache.batik.util,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value.css2;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value.svg;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value.svg12;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.parser;uses:=&quot;org.apache.batik.i18n,org.apache.batik.util.io,org.w3c.css.sac&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.css.engine,org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.css2,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.css.parser,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io,org.apache.xmlgraphics.java2d.color;resolution:=optional,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg,org.w3c.dom.views"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1517,6 +1669,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik SVG DOM implementation"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svg-dom"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svg-dom"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.dom.svg;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.util,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.smil,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.svg12;uses:=&quot;org.apache.batik.dom.events,org.apache.batik.dom.xbl,org.w3c.dom.events,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.awt.geom,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.svg,org.w3c.dom.views"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1539,6 +1702,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik Graphics Vector Tree (GVT)"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-gvt"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.gvt"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.gvt;uses:=&quot;javax.swing.event,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image.renderable,org.apache.batik.gvt.event,org.apache.batik.gvt.filter&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.filter;uses:=&quot;org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.gvt&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.event;uses:=&quot;javax.swing.event,org.apache.batik.gvt&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.font;uses:=&quot;org.apache.batik.gvt,org.apache.batik.gvt.text,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.flow;uses:=&quot;org.apache.batik.ext.awt.geom,org.apache.batik.gvt.font&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.renderer;uses:=&quot;org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.gvt&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.text;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing.event,org.apache.batik.ext.awt,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.filter,org.apache.batik.gvt.font,org.apache.batik.gvt.text,org.apache.batik.util"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1550,6 +1724,33 @@
     </jar>
   </target>
 
+  <target name="i18n-jar" depends="init, compile, prepare-build">
+    <jar jarfile="${build}/lib/${project}-i18n-${completeVersion}.jar">
+      <manifest>
+        <attribute name="Implementation-Title" value="Batik i18n library"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
+        <attribute name="Implementation-Vendor" value="${vendor}"/>
+        <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik i18n library"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-i18n"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.i18n"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.i18n;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
+      </manifest>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <fileset dir="${dest}">
+        <include name="${package-prefix}/i18n/**/*.class"/>
+      </fileset>
+      <!-- <fileset dir="batik-i18n/src/main/resources" excludes="**/.svn/">
+        <include name="${package-prefix}/i18n/**/resources/*"/>
+      </fileset> -->
+    </jar>
+  </target>
 
   <!-- Parser (dependencies: util) -->
   <target name="parser-jar" depends="init, compile, prepare-build">
@@ -1559,6 +1760,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik SVG microsyntax parser"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-parser"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.parser"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.parser;uses:=&quot;org.apache.batik.ext.awt.geom,org.apache.batik.i18n,org.apache.batik.util.io,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.ext.awt.geom,org.apache.batik.i18n,org.apache.batik.util.io,org.apache.batik.xml,org.w3c.dom"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1579,6 +1791,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik script language support"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-script"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.script"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.script;uses:=&quot;org.apache.batik.i18n,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.script.rhino;uses:=&quot;org.apache.batik.i18n,org.mozilla.javascript&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.script.jpython;uses:=&quot;org.apache.batik.script&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.anim.dom,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.util,org.mozilla.javascript;resolution:=optional,org.python.core;resolution:=optional,org.python.util;resolution:=optional,org.w3c.dom"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1600,6 +1823,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik SVG transcoder"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-transcoder"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.transcoder"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.transcoder;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.dom.util,org.apache.batik.gvt,org.apache.batik.svggen,org.apache.batik.util,org.w3c.dom,org.xml.sax&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.svg2svg;uses:=&quot;org.apache.batik.transcoder,org.apache.batik.xml&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.keys;uses:=&quot;org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.image.resources;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.image;uses:=&quot;org.apache.batik.bridge,org.apache.batik.gvt.renderer,org.apache.batik.transcoder,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.wmf.tosvg;uses:=&quot;org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.wmf;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.print;uses:=&quot;org.apache.batik.transcoder,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.dom.util,org.apache.batik.ext.awt,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.renderer,org.apache.batik.i18n,org.apache.batik.svggen,org.apache.batik.transcoder,org.apache.batik.transcoder.image.resources,org.apache.batik.transcoder.keys,org.apache.batik.util,org.apache.batik.xml,org.w3c.dom,org.w3c.dom.svg,org.xml.sax"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1619,6 +1853,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik XML utilities"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-xml"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.xml"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.xml;uses:=&quot;org.apache.batik.i18n,org.apache.batik.util.io&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1638,6 +1883,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik bridge"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-bridge"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.bridge"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.bridge;uses:=&quot;org.apache.batik.anim,org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.xbl,org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.filter,org.apache.batik.gvt.font,org.apache.batik.gvt.renderer,org.apache.batik.gvt.text,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.script,org.apache.batik.script.rhino,org.apache.batik.util,org.apache.batik.w3c.dom,org.apache.xmlgraphics.java2d.color,org.mozilla.javascript,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.bridge.svg12;uses:=&quot;javax.swing.event,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg12,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.flow,org.apache.batik.gvt.text,org.apache.batik.parser,org.apache.batik.script,org.apache.batik.util,org.apache.xml.utils,org.apache.xpath,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing.event,javax.xml.transform,org.apache.batik.anim,org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.svg12,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.filter,org.apache.batik.gvt.flow,org.apache.batik.gvt.font,org.apache.batik.gvt.renderer,org.apache.batik.gvt.text,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.script,org.apache.batik.script.rhino,org.apache.batik.util,org.apache.batik.util.io,org.apache.batik.w3c.dom,org.apache.batik.xml,org.apache.xml.utils,org.apache.xmlgraphics.java2d.color,org.apache.xmlgraphics.java2d.color.profile,org.apache.xpath,org.apache.xpath.objects,org.mozilla.javascript;resolution:=optional,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg,org.w3c.dom.views,org.w3c.dom.xpath"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1650,6 +1906,31 @@
     </jar>
   </target>
 
+  <target name="constants-jar" depends="init, compile, prepare-build">
+    <jar jarfile="${build}/lib/${project}-constants-${completeVersion}.jar">
+      <manifest>
+        <attribute name="Implementation-Title" value="Batik constants library"/>
+        <attribute name="Implementation-Version" value="${completeVersion}"/>
+        <attribute name="Implementation-Vendor" value="${vendor}"/>
+        <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik constants library"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-constants"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.constants"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.util;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
+      </manifest>
+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+      <fileset dir="${dest}">
+        <include name="${package-prefix}/util/XMLConstants*.class"/>
+      </fileset>
+    </jar>
+  </target>
+
   <!-- Swing (dependencies: all) -->
   <target name="swing-jar" depends="init, compile, prepare-build">
     <jar jarfile="${build}/lib/${project}-swing-${completeVersion}.jar">
@@ -1658,6 +1939,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik SVG Swing components"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-swing"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.swing"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.swing;uses:=&quot;javax.swing,javax.swing.event,org.apache.batik.bridge,org.apache.batik.i18n,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.util,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.swing.svg;uses:=&quot;javax.swing.filechooser,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.renderer,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.swing.gvt,org.apache.batik.util,org.w3c.dom,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.swing.gvt;uses:=&quot;javax.swing,org.apache.batik.bridge,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.renderer,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing,javax.swing.event,javax.swing.filechooser,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.css.engine,org.apache.batik.dom.events,org.apache.batik.dom.util,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.renderer,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.util,org.apache.batik.util.gui,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.svg"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1677,6 +1969,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik animation engine"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-anim"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.anim"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.anim;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.ext.awt.geom,org.apache.batik.util,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.anim.dom;uses:=&quot;org.apache.batik.anim.values,org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.stylesheets,org.w3c.dom.svg,org.w3c.dom.views,org.xml.sax&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.anim.timing;uses:=&quot;org.apache.batik.anim,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.events&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.anim.values;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.anim,org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.apache.batik.css.parser,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.svg12,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.awt.geom,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.util,org.apache.batik.w3c.dom.events,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.stylesheets,org.w3c.dom.svg,org.w3c.dom.views,org.xml.sax"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1699,6 +2002,17 @@
         <attribute name="Implementation-Version" value="${completeVersion}"/>
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
+        <attribute name="Bundle-Description" value="Batik Extension Support"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-extension"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.extension"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.extension.svg;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.dom,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.extension,org.apache.batik.gvt,org.apache.batik.gvt.font,org.apache.batik.gvt.text,org.apache.batik.parser,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.extension;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.util,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.util,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.extension,org.apache.batik.gvt,org.apache.batik.gvt.font,org.apache.batik.gvt.text,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1729,14 +2043,17 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgpp.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
+        <attribute name="Bundle-Description" value="Batik SVG Pretty Printer Application"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svgpp"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgpp"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.apps.svgpp;uses:=&quot;org.apache.batik.i18n,org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="org.apache.batik.i18n,org.apache.batik.transcoder,org.apache.batik.transcoder.svg2svg"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1767,26 +2084,17 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.slideshow.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gui-uti-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
+        <attribute name="Bundle-Description" value="Batik SVG Slideshow Application"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-slideshow"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.slideshow"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
+        <attribute name="Export-Package" value="org.apache.batik.apps.slideshow;uses:=&quot;javax.swing&quot;;version=&quot;${completeVersion}&quot;"/>
+        <attribute name="Import-Package" value="javax.swing,org.apache.batik.bridge,org.apache.batik.gvt,org.apache.batik.gvt.renderer,org.w3c.dom,org.w3c.dom.svg"/>
+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1823,29 +2131,14 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
         <attribute name="Build-Id" value="${build.id}"/>
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-swing-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gui-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
+        <attribute name="Bundle-Description" value="Batik SVG Browser Application"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-squiggle"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.squiggle"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1888,8 +2181,14 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-squiggle-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-${project}-extension-${completeVersion}.ja" />
+        <attribute name="Bundle-Description" value="Batik SVG Browser Application with Extensions"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-squiggle-ext"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.squiggle-ext"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
@@ -1935,28 +2234,14 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.rasterizer.Main" />
         <attribute name="Build-Id" value="${build.id}"/>
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}fop-transcoder-allinone-${fopVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar" />
+        <attribute name="Bundle-Description" value="Batik SVG Rasterizer Application"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-rasterizer"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.rasterizer"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -1996,8 +2281,14 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-extension-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-rasterizer-${jarVersion}.jar" />
+        <attribute name="Bundle-Description" value="Batik SVG Rasterizer Application with Extensions"/>
+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-rasterizer-ext"/>
+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.rasterizer-ext"/>
+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Bundle-Version" value="${completeVersion}"/>
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
@@ -2033,8 +2324,17 @@
       <attribute name="Implementation-Vendor" value="${vendor}"/>
       <attribute name="Build-Id" value="${build.id}"/>
       <attribute name="Main-Class" value="org.apache.batik.apps.ttf2svg.Main"/>
-      <attribute name="Class-Path" value="${jarsLibDir}${project}-svggen-${jarVersion}.jar" />
-      <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
+      <attribute name="Bundle-Description" value="Batik Truetype Font to SVG Font Converter Application"/>
+      <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
+      <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+      <attribute name="Bundle-ManifestVersion" value="2"/>
+      <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-ttf2svg"/>
+      <attribute name="Bundle-SymbolicName" value="org.apache.batik.ttf2svg"/>
+      <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
+      <attribute name="Bundle-Version" value="${completeVersion}"/>
+      <attribute name="Export-Package" value="org.apache.batik.apps.ttf2svg;version=&quot;${completeVersion}&quot;"/>
+      <attribute name="Import-Package" value="org.apache.batik.svggen.font"/>
+      <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
     </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
       <fileset dir="${dest}">
@@ -2052,34 +2352,6 @@
         <attribute name="Implementation-Vendor" value="${vendor}"/>
         <attribute name="Build-Id" value="${build.id}"/>
         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="lib/${project}-ext-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-dom-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-css-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-svg-dom-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-gvt-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-parser-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-script-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-bridge-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-swing-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-anim-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-transcoder-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-gui-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-awt-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-codec-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-svggen-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-xml-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-squiggle-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-rasterizer-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-svgpp-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/xercesImpl-2.9.1.jar" />
-        <attribute name="Class-Path" value="lib/xalan-2.7.2.jar" />
-        <attribute name="Class-Path" value="lib/xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="lib/xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="lib/js.jar" />
-        <attribute name="Class-Path" value="lib/fop-transcoder-allinone-${fopVersion}.jar" />
-        <attribute name="Class-Path" value="lib/xmlgraphics-commons-${xgcVersion}.jar" />
       </manifest>
       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
     </jar>
