Attachment 131010 Details for Bug 263360 – A few more fixes to javax.persistence.jar generation

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] A few more fixes to javax.persistence.jar generation

263360-2.patch (text/plain), 217.00 KB, created by Eric Gwin

on 2009-04-06 11:37:54 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Gwin

Created: 2009-04-06 11:37:54 EDT

Size: 217.00 KB

patch

obsolete

>Index: autobuild.xml
>===================================================================
>--- autobuild.xml	(revision 3854)
>+++ autobuild.xml	(working copy)
>@@ -122,13 +122,10 @@
>         
>         
>         
>-        <condition property="version.string" value="${release.version}.${build.date}-${build.type}">
>+        <condition property="version.string" value="${release.version}.qualifier" 
>+                                              else="${release.version}.v${build.date}-r${svn.revision}">
>             <equals arg1="${svn.revision}" arg2="NA"/>
>         </condition>
>-        <condition property="version.string" value="${release.version}.r${svn.revision}">
>-            <equals arg1="${build.type}" arg2="RELEASE"/>
>-        </condition>
>-        <property name="version.string" value="${release.version}.r${svn.revision}-${build.type}"/>
> 
>         
>         <condition property="download.path" value="${eclipselink.download.path}/nightly/${release.version}/${build.date}">
>Index: build.xml
>===================================================================
>--- build.xml	(revision 3854)
>+++ build.xml	(working copy)
>@@ -109,10 +109,14 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <condition property="version.string" value="${release.version}.qualifier" 
>+                                          else="${release.version}.v${build.date}-r${svn.revision}">
>+        <equals arg1="${svn.revision}" arg2="NA"/>
>+    </condition>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     <path id="javadoc.path">
>Index: dbws/eclipselink.dbws.test/build.xml
>===================================================================
>--- dbws/eclipselink.dbws.test/build.xml	(revision 3854)
>+++ dbws/eclipselink.dbws.test/build.xml	(working copy)
>@@ -59,10 +59,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>Index: dbws/org.eclipse.persistence.dbws/build.xml
>===================================================================
>--- dbws/org.eclipse.persistence.dbws/build.xml	(revision 3854)
>+++ dbws/org.eclipse.persistence.dbws/build.xml	(working copy)
>@@ -48,10 +48,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>@@ -97,7 +98,7 @@
> 
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${dbws.2.common.plugins.dir}/${eclipselink.dbws.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${dbws.2.common.plugins.dir}/${eclipselink.dbws.bndl.prefix}_${version.string}.jar" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${dbws.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -134,24 +135,26 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink DBWS${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence.dbws;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.dbws;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.xr;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.xr.sxf;version=&quot;${release.version}&quot;${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: javax.activation;version=&quot;1.1.0&quot;,${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.servlet;version=&quot;2.4.0&quot;,${line.separator}"                                                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.soap;version=&quot;1.3.0&quot;,${line.separator}"                                                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.ws;version=&quot;2.0.0&quot;,${line.separator}"                                                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.ws.soap;version=&quot;2.0.0&quot;${line.separator}"                                                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink DBWS${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport,${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence.dbws;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.dbws;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.xr;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.xr.sxf;version=&quot;${release.version}&quot;${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: javax.activation;version=&quot;1.1.0&quot;,${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.servlet;version=&quot;2.4.0&quot;,${line.separator}"                                                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.soap;version=&quot;1.3.0&quot;,${line.separator}"                                                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.ws;version=&quot;2.0.0&quot;,${line.separator}"                                                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.ws.soap;version=&quot;2.0.0&quot;${line.separator}"                                                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
> </project>
>\ No newline at end of file
>Index: dbws/org.eclipse.persistence.dbws/META-INF/MANIFEST.MF
>===================================================================
>--- dbws/org.eclipse.persistence.dbws/META-INF/MANIFEST.MF	(revision 3854)
>+++ dbws/org.eclipse.persistence.dbws/META-INF/MANIFEST.MF	(working copy)
>@@ -2,13 +2,15 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink DBWS
> Bundle-SymbolicName: org.eclipse.persistence.dbws
>-Bundle-Version: 1.1.0
>-Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.0";visibility:=reexport,
>- org.eclipse.persistence.asm;bundle-version="1.1.0"
>-Export-Package: org.eclipse.persistence.dbws;version="1.1.0",
>- org.eclipse.persistence.internal.dbws;version="1.1.0",
>- org.eclipse.persistence.internal.xr;version="1.1.0",
>- org.eclipse.persistence.internal.xr.sxf;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.1";visibility:=reexport,
>+ org.eclipse.persistence.asm;bundle-version="1.1.1"
>+Export-Package: org.eclipse.persistence.dbws;version="1.1.1",
>+ org.eclipse.persistence.internal.dbws;version="1.1.1",
>+ org.eclipse.persistence.internal.xr;version="1.1.1",
>+ org.eclipse.persistence.internal.xr.sxf;version="1.1.1"
> Import-Package: javax.activation;version="1.1.0",
>  javax.servlet;version="2.4.0",
>  javax.xml.soap;version="1.3.0",
>Index: foundation/eclipselink.extension.oracle.test/build.xml
>===================================================================
>--- foundation/eclipselink.extension.oracle.test/build.xml	(revision 3854)
>+++ foundation/eclipselink.extension.oracle.test/build.xml	(working copy)
>@@ -70,10 +70,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>Index: foundation/org.eclipse.persistence.core/build.xml
>===================================================================
>--- foundation/org.eclipse.persistence.core/build.xml	(revision 3854)
>+++ foundation/org.eclipse.persistence.core/build.xml	(working copy)
>@@ -50,10 +50,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
>     <property name="eclipselink.core.bndl.prefix" value="${ant.project.name}"/>
> 
>@@ -88,10 +89,12 @@
>         <echo message="Stamping the following values:"/>
>         <echo message="version:       '${release.version}'"/>
>         <echo message="buildDate:     '${build.date}'"/>
>+        <echo message="buildTime:     '${build.time}'"/>
>         <echo message="buildType:     '${build.type}'"/>
>         <echo message="buildRevision: '${svn.revision}'"/>
>         <filter token="VERSION" value="${release.version}"/>
>         <filter token="BUILD_DATE" value="${build.date}"/>
>+        <filter token="BUILD_TIME" value="${build.time}"/>
>         <filter token="BUILD_TYPE" value="${build.type}"/>
>         <filter token="BUILD_REVISION" value="${svn.revision}"/>
>         <copy file="${src.dir}/org/eclipse/persistence/Version.java" tofile="${basedir}/${classes.dir}/org/eclipse/persistence/Version.java" filtering="true"/>
>@@ -129,7 +132,7 @@
> 
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${core.2.common.plugins.dir}/${eclipselink.core.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${core.2.common.plugins.dir}/${eclipselink.core.bndl.prefix}_${version.string}.jar" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${core.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -167,167 +170,168 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink Core${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Require-Bundle: org.eclipse.persistence.antlr;bundle-version=&quot;${release.version}&quot;;resolution:=optional,${line.separator}"      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;;resolution:=optional${line.separator}"                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence;version=&quot;${release.version}&quot;,${line.separator}"                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.annotations;version=&quot;${release.version}&quot;,${line.separator}"                                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.config;version=&quot;${release.version}&quot;,${line.separator}"                                                file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.descriptors;version=&quot;${release.version}&quot;,${line.separator}"                                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.descriptors.changetracking;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.descriptors.copying;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.descriptors.invalidation;version=&quot;${release.version}&quot;,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.eis;version=&quot;${release.version}&quot;,${line.separator}"                                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.eis.adapters.jms;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.eis.adapters.xmlfile;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.eis.interactions;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.eis.mappings;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.exceptions;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.exceptions.i18n;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.expressions;version=&quot;${release.version}&quot;,${line.separator}"                                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.expressions.spatial;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.history;version=&quot;${release.version}&quot;,${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.indirection;version=&quot;${release.version}&quot;,${line.separator}"                                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.codegen;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.databaseaccess;version=&quot;${release.version}&quot;,${line.separator}"                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.descriptors;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.descriptors.changetracking;version=&quot;${release.version}&quot;,${line.separator}"                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.dynamicpersist;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.eis.adapters.jms;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.eis.adapters.xmlfile;version=&quot;${release.version}&quot;,${line.separator}"                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.eis.cobol;version=&quot;${release.version}&quot;,${line.separator}"                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.eis.cobol.helper;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.expressions;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.helper;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.helper.linkedlist;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.history;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.identitymaps;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.indirection;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.parsing;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.parsing.jpql;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.parsing.jpql.antlr;version=&quot;${release.version}&quot;,${line.separator}"                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.localization;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.localization.i18n;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm.conversion;version=&quot;${release.version}&quot;,${line.separator}"                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm.documentpreservation;version=&quot;${release.version}&quot;,${line.separator}"                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm.record;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm.record.deferred;version=&quot;${release.version}&quot;,${line.separator}"                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm.schema;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.oxm.schema.model;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.platform.database;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.queries;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.security;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sequencing;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination;version=&quot;${release.version}&quot;,${line.separator}"                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination.broadcast;version=&quot;${release.version}&quot;,${line.separator}"              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination.corba;version=&quot;${release.version}&quot;,${line.separator}"                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination.corba.sun;version=&quot;${release.version}&quot;,${line.separator}"              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination.jms;version=&quot;${release.version}&quot;,${line.separator}"                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination.rmi;version=&quot;${release.version}&quot;,${line.separator}"                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.coordination.rmi.iiop;version=&quot;${release.version}&quot;,${line.separator}"               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories;version=&quot;${release.version}&quot;,${line.separator}"                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model;version=&quot;${release.version}&quot;,${line.separator}"                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.event;version=&quot;${release.version}&quot;,${line.separator}"               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.log;version=&quot;${release.version}&quot;,${line.separator}"                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.login;version=&quot;${release.version}&quot;,${line.separator}"               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.platform;version=&quot;${release.version}&quot;,${line.separator}"            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.pool;version=&quot;${release.version}&quot;,${line.separator}"                file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.project;version=&quot;${release.version}&quot;,${line.separator}"             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.property;version=&quot;${release.version}&quot;,${line.separator}"            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.rcm;version=&quot;${release.version}&quot;,${line.separator}"                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.rcm.command;version=&quot;${release.version}&quot;,${line.separator}"         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.sequencing;version=&quot;${release.version}&quot;,${line.separator}"          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.session;version=&quot;${release.version}&quot;,${line.separator}"             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.transport;version=&quot;${release.version}&quot;,${line.separator}"           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.transport.discovery;version=&quot;${release.version}&quot;,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.transport.naming;version=&quot;${release.version}&quot;,${line.separator}"    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.sessions.remote;version=&quot;${release.version}&quot;,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.weaving;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.logging;version=&quot;${release.version}&quot;,${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings;version=&quot;${release.version}&quot;,${line.separator}"                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings.converters;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings.foundation;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings.querykeys;version=&quot;${release.version}&quot;,${line.separator}"                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings.structures;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings.transformers;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.mappings.xdb;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm;version=&quot;${release.version}&quot;,${line.separator}"                                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.annotations;version=&quot;${release.version}&quot;,${line.separator}"                                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.attachment;version=&quot;${release.version}&quot;,${line.separator}"                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.documentpreservation;version=&quot;${release.version}&quot;,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.mappings;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.mappings.converters;version=&quot;${release.version}&quot;,${line.separator}"                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.mappings.nullpolicy;version=&quot;${release.version}&quot;,${line.separator}"                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.platform;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.record;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.schema;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.sequenced;version=&quot;${release.version}&quot;,${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.oxm.unmapped;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.database;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.database.converters;version=&quot;${release.version}&quot;,${line.separator}"                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.database.jdbc;version=&quot;${release.version}&quot;,${line.separator}"                                file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.database.oracle.plsql;version=&quot;${release.version}&quot;,${line.separator}"                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.server;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.server.jboss;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.server.oc4j;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.server.sunas;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.server.was;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.server.wls;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.xml;version=&quot;${release.version}&quot;,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.xml.jaxp;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.queries;version=&quot;${release.version}&quot;,${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sequencing;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.services;version=&quot;${release.version}&quot;,${line.separator}"                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.services.mbean;version=&quot;${release.version}&quot;,${line.separator}"                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.services.weblogic;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions;version=&quot;${release.version}&quot;,${line.separator}"                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.broker;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.changesets;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.coordination;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.coordination.broadcast;version=&quot;${release.version}&quot;,${line.separator}"                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.coordination.corba;version=&quot;${release.version}&quot;,${line.separator}"                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.coordination.corba.sun;version=&quot;${release.version}&quot;,${line.separator}"                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.coordination.jms;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.coordination.rmi;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.factories;version=&quot;${release.version}&quot;,${line.separator}"                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.interceptors;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.remote;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.remote.corba.sun;version=&quot;${release.version}&quot;,${line.separator}"                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.remote.rmi;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.remote.rmi.iiop;version=&quot;${release.version}&quot;,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sessions.server;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.tools;version=&quot;${release.version}&quot;,${line.separator}"                                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.tools.file;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.tools.profiler;version=&quot;${release.version}&quot;,${line.separator}"                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.tools.schemaframework;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.transaction;version=&quot;${release.version}&quot;,${line.separator}"                                           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.transaction.jboss;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.transaction.oc4j;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.transaction.sunas;version=&quot;${release.version}&quot;,${line.separator}"                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.transaction.was;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.transaction.wls;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" xsd;version=&quot;${release.version}&quot;${line.separator}"                                                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: javax.activation;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.jms;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.mail;version=&quot;1.4.0&quot;;resolution:=optional,${line.separator}"                                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.mail.internet;version=&quot;1.4.0&quot;;resolution:=optional,${line.separator}"                                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.persistence;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.persistence.spi;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.resource;version=&quot;1.5.0&quot;;resolution:=optional,${line.separator}"                                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.resource.cci;version=&quot;1.5.0&quot;;resolution:=optional,${line.separator}"                                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.transaction;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                                     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.w3c.dom${line.separator}"                                                                                                           file="META-INF/MANIFEST.MF" append="true"/>
>-
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Premain-Class: org.eclipse.persistence.internal.jpa.deployment.JavaSECMPInitializerAgent${line.separator}"                               file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink Core${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Require-Bundle: org.eclipse.persistence.antlr;bundle-version=&quot;${release.version}&quot;;resolution:=optional,${line.separator}"      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;;resolution:=optional${line.separator}"                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence;version=&quot;${release.version}&quot;,${line.separator}"                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.annotations;version=&quot;${release.version}&quot;,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.config;version=&quot;${release.version}&quot;,${line.separator}"                                                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.descriptors;version=&quot;${release.version}&quot;,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.descriptors.changetracking;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.descriptors.copying;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.descriptors.invalidation;version=&quot;${release.version}&quot;,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.eis;version=&quot;${release.version}&quot;,${line.separator}"                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.eis.adapters.jms;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.eis.adapters.xmlfile;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.eis.interactions;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.eis.mappings;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.exceptions;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.exceptions.i18n;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.expressions;version=&quot;${release.version}&quot;,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.expressions.spatial;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.history;version=&quot;${release.version}&quot;,${line.separator}"                                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.indirection;version=&quot;${release.version}&quot;,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.codegen;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.databaseaccess;version=&quot;${release.version}&quot;,${line.separator}"                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.descriptors;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.descriptors.changetracking;version=&quot;${release.version}&quot;,${line.separator}"                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.dynamicpersist;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.eis.adapters.jms;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.eis.adapters.xmlfile;version=&quot;${release.version}&quot;,${line.separator}"                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.eis.cobol;version=&quot;${release.version}&quot;,${line.separator}"                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.eis.cobol.helper;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.expressions;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.helper;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.helper.linkedlist;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.history;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.identitymaps;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.indirection;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.parsing;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.parsing.jpql;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.parsing.jpql.antlr;version=&quot;${release.version}&quot;,${line.separator}"                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.localization;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.localization.i18n;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm.conversion;version=&quot;${release.version}&quot;,${line.separator}"                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm.documentpreservation;version=&quot;${release.version}&quot;,${line.separator}"                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm.record;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm.record.deferred;version=&quot;${release.version}&quot;,${line.separator}"                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm.schema;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.oxm.schema.model;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.platform.database;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.queries;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.security;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sequencing;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination;version=&quot;${release.version}&quot;,${line.separator}"                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination.broadcast;version=&quot;${release.version}&quot;,${line.separator}"              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination.corba;version=&quot;${release.version}&quot;,${line.separator}"                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination.corba.sun;version=&quot;${release.version}&quot;,${line.separator}"              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination.jms;version=&quot;${release.version}&quot;,${line.separator}"                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination.rmi;version=&quot;${release.version}&quot;,${line.separator}"                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.coordination.rmi.iiop;version=&quot;${release.version}&quot;,${line.separator}"               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories;version=&quot;${release.version}&quot;,${line.separator}"                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model;version=&quot;${release.version}&quot;,${line.separator}"                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.event;version=&quot;${release.version}&quot;,${line.separator}"               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.log;version=&quot;${release.version}&quot;,${line.separator}"                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.login;version=&quot;${release.version}&quot;,${line.separator}"               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.platform;version=&quot;${release.version}&quot;,${line.separator}"            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.pool;version=&quot;${release.version}&quot;,${line.separator}"                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.project;version=&quot;${release.version}&quot;,${line.separator}"             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.property;version=&quot;${release.version}&quot;,${line.separator}"            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.rcm;version=&quot;${release.version}&quot;,${line.separator}"                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.rcm.command;version=&quot;${release.version}&quot;,${line.separator}"         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.sequencing;version=&quot;${release.version}&quot;,${line.separator}"          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.session;version=&quot;${release.version}&quot;,${line.separator}"             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.transport;version=&quot;${release.version}&quot;,${line.separator}"           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.transport.discovery;version=&quot;${release.version}&quot;,${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.factories.model.transport.naming;version=&quot;${release.version}&quot;,${line.separator}"    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.sessions.remote;version=&quot;${release.version}&quot;,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.weaving;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.logging;version=&quot;${release.version}&quot;,${line.separator}"                                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings;version=&quot;${release.version}&quot;,${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings.converters;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings.foundation;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings.querykeys;version=&quot;${release.version}&quot;,${line.separator}"                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings.structures;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings.transformers;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.mappings.xdb;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm;version=&quot;${release.version}&quot;,${line.separator}"                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.annotations;version=&quot;${release.version}&quot;,${line.separator}"                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.attachment;version=&quot;${release.version}&quot;,${line.separator}"                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.documentpreservation;version=&quot;${release.version}&quot;,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.mappings;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.mappings.converters;version=&quot;${release.version}&quot;,${line.separator}"                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.mappings.nullpolicy;version=&quot;${release.version}&quot;,${line.separator}"                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.platform;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.record;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.schema;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.sequenced;version=&quot;${release.version}&quot;,${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.oxm.unmapped;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.database;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.database.converters;version=&quot;${release.version}&quot;,${line.separator}"                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.database.jdbc;version=&quot;${release.version}&quot;,${line.separator}"                                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.database.oracle.plsql;version=&quot;${release.version}&quot;,${line.separator}"                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.server;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.server.jboss;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.server.oc4j;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.server.sunas;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.server.was;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.server.wls;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.xml;version=&quot;${release.version}&quot;,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.xml.jaxp;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.queries;version=&quot;${release.version}&quot;,${line.separator}"                                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sequencing;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.services;version=&quot;${release.version}&quot;,${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.services.mbean;version=&quot;${release.version}&quot;,${line.separator}"                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.services.weblogic;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions;version=&quot;${release.version}&quot;,${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.broker;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.changesets;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.coordination;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.coordination.broadcast;version=&quot;${release.version}&quot;,${line.separator}"                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.coordination.corba;version=&quot;${release.version}&quot;,${line.separator}"                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.coordination.corba.sun;version=&quot;${release.version}&quot;,${line.separator}"                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.coordination.jms;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.coordination.rmi;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.factories;version=&quot;${release.version}&quot;,${line.separator}"                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.interceptors;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.remote;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.remote.corba.sun;version=&quot;${release.version}&quot;,${line.separator}"                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.remote.rmi;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.remote.rmi.iiop;version=&quot;${release.version}&quot;,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sessions.server;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.tools;version=&quot;${release.version}&quot;,${line.separator}"                                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.tools.file;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.tools.profiler;version=&quot;${release.version}&quot;,${line.separator}"                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.tools.schemaframework;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.transaction;version=&quot;${release.version}&quot;,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.transaction.jboss;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.transaction.oc4j;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.transaction.sunas;version=&quot;${release.version}&quot;,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.transaction.was;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.transaction.wls;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" xsd;version=&quot;${release.version}&quot;${line.separator}"                                                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: javax.activation;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.jms;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.mail;version=&quot;1.4.0&quot;;resolution:=optional,${line.separator}"                                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.mail.internet;version=&quot;1.4.0&quot;;resolution:=optional,${line.separator}"                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.persistence;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.persistence.spi;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.resource;version=&quot;1.5.0&quot;;resolution:=optional,${line.separator}"                                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.resource.cci;version=&quot;1.5.0&quot;;resolution:=optional,${line.separator}"                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.transaction;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.w3c.dom${line.separator}"                                                                                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Premain-Class: org.eclipse.persistence.internal.jpa.deployment.JavaSECMPInitializerAgent${line.separator}"                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
> </project>
>Index: foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF
>===================================================================
>--- foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF	(revision 3854)
>+++ foundation/org.eclipse.persistence.core/META-INF/MANIFEST.MF	(working copy)
>@@ -2,148 +2,150 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink Core
> Bundle-SymbolicName: org.eclipse.persistence.core
>-Bundle-Version: 1.1.0
>-Require-Bundle: org.eclipse.persistence.antlr;bundle-version="1.1.0";resolution:=optional,
>- org.eclipse.persistence.asm;bundle-version="1.1.0";resolution:=optional
>-Export-Package: org.eclipse.persistence;version="1.1.0",
>- org.eclipse.persistence.annotations;version="1.1.0",
>- org.eclipse.persistence.config;version="1.1.0",
>- org.eclipse.persistence.descriptors;version="1.1.0",
>- org.eclipse.persistence.descriptors.changetracking;version="1.1.0",
>- org.eclipse.persistence.descriptors.copying;version="1.1.0",
>- org.eclipse.persistence.descriptors.invalidation;version="1.1.0",
>- org.eclipse.persistence.eis;version="1.1.0",
>- org.eclipse.persistence.eis.adapters.jms;version="1.1.0",
>- org.eclipse.persistence.eis.adapters.xmlfile;version="1.1.0",
>- org.eclipse.persistence.eis.interactions;version="1.1.0",
>- org.eclipse.persistence.eis.mappings;version="1.1.0",
>- org.eclipse.persistence.exceptions;version="1.1.0",
>- org.eclipse.persistence.exceptions.i18n;version="1.1.0",
>- org.eclipse.persistence.expressions;version="1.1.0",
>- org.eclipse.persistence.expressions.spatial;version="1.1.0",
>- org.eclipse.persistence.history;version="1.1.0",
>- org.eclipse.persistence.indirection;version="1.1.0",
>- org.eclipse.persistence.internal.codegen;version="1.1.0",
>- org.eclipse.persistence.internal.databaseaccess;version="1.1.0",
>- org.eclipse.persistence.internal.descriptors;version="1.1.0",
>- org.eclipse.persistence.internal.descriptors.changetracking;version="1.1.0",
>- org.eclipse.persistence.internal.dynamicpersist;version="1.1.0",
>- org.eclipse.persistence.internal.eis.adapters.jms;version="1.1.0",
>- org.eclipse.persistence.internal.eis.adapters.xmlfile;version="1.1.0",
>- org.eclipse.persistence.internal.eis.cobol;version="1.1.0",
>- org.eclipse.persistence.internal.eis.cobol.helper;version="1.1.0",
>- org.eclipse.persistence.internal.expressions;version="1.1.0",
>- org.eclipse.persistence.internal.helper;version="1.1.0",
>- org.eclipse.persistence.internal.helper.linkedlist;version="1.1.0",
>- org.eclipse.persistence.internal.history;version="1.1.0",
>- org.eclipse.persistence.internal.identitymaps;version="1.1.0",
>- org.eclipse.persistence.internal.indirection;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.parsing;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.parsing.jpql;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.parsing.jpql.antlr;version="1.1.0",
>- org.eclipse.persistence.internal.localization;version="1.1.0",
>- org.eclipse.persistence.internal.localization.i18n;version="1.1.0",
>- org.eclipse.persistence.internal.oxm;version="1.1.0",
>- org.eclipse.persistence.internal.oxm.conversion;version="1.1.0",
>- org.eclipse.persistence.internal.oxm.documentpreservation;version="1.1.0",
>- org.eclipse.persistence.internal.oxm.record;version="1.1.0",
>- org.eclipse.persistence.internal.oxm.record.deferred;version="1.1.0",
>- org.eclipse.persistence.internal.oxm.schema;version="1.1.0",
>- org.eclipse.persistence.internal.oxm.schema.model;version="1.1.0",
>- org.eclipse.persistence.internal.platform.database;version="1.1.0",
>- org.eclipse.persistence.internal.queries;version="1.1.0",
>- org.eclipse.persistence.internal.security;version="1.1.0",
>- org.eclipse.persistence.internal.sequencing;version="1.1.0",
>- org.eclipse.persistence.internal.sessions;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination.broadcast;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination.corba;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination.corba.sun;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination.jms;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination.rmi;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.coordination.rmi.iiop;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.event;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.log;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.login;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.platform;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.pool;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.project;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.property;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.rcm;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.rcm.command;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.sequencing;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.session;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.transport;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.transport.discovery;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.factories.model.transport.naming;version="1.1.0",
>- org.eclipse.persistence.internal.sessions.remote;version="1.1.0",
>- org.eclipse.persistence.internal.weaving;version="1.1.0",
>- org.eclipse.persistence.logging;version="1.1.0",
>- org.eclipse.persistence.mappings;version="1.1.0",
>- org.eclipse.persistence.mappings.converters;version="1.1.0",
>- org.eclipse.persistence.mappings.foundation;version="1.1.0",
>- org.eclipse.persistence.mappings.querykeys;version="1.1.0",
>- org.eclipse.persistence.mappings.structures;version="1.1.0",
>- org.eclipse.persistence.mappings.transformers;version="1.1.0",
>- org.eclipse.persistence.mappings.xdb;version="1.1.0",
>- org.eclipse.persistence.oxm;version="1.1.0",
>- org.eclipse.persistence.oxm.annotations;version="1.1.0",
>- org.eclipse.persistence.oxm.attachment;version="1.1.0",
>- org.eclipse.persistence.oxm.documentpreservation;version="1.1.0",
>- org.eclipse.persistence.oxm.mappings;version="1.1.0",
>- org.eclipse.persistence.oxm.mappings.converters;version="1.1.0",
>- org.eclipse.persistence.oxm.mappings.nullpolicy;version="1.1.0",
>- org.eclipse.persistence.oxm.platform;version="1.1.0",
>- org.eclipse.persistence.oxm.record;version="1.1.0",
>- org.eclipse.persistence.oxm.schema;version="1.1.0",
>- org.eclipse.persistence.oxm.sequenced;version="1.1.0",
>- org.eclipse.persistence.oxm.unmapped;version="1.1.0",
>- org.eclipse.persistence.platform.database;version="1.1.0",
>- org.eclipse.persistence.platform.database.converters;version="1.1.0",
>- org.eclipse.persistence.platform.database.jdbc;version="1.1.0",
>- org.eclipse.persistence.platform.database.oracle.plsql;version="1.1.0",
>- org.eclipse.persistence.platform.server;version="1.1.0",
>- org.eclipse.persistence.platform.server.jboss;version="1.1.0",
>- org.eclipse.persistence.platform.server.oc4j;version="1.1.0",
>- org.eclipse.persistence.platform.server.sunas;version="1.1.0",
>- org.eclipse.persistence.platform.server.was;version="1.1.0",
>- org.eclipse.persistence.platform.server.wls;version="1.1.0",
>- org.eclipse.persistence.platform.xml;version="1.1.0",
>- org.eclipse.persistence.platform.xml.jaxp;version="1.1.0",
>- org.eclipse.persistence.queries;version="1.1.0",
>- org.eclipse.persistence.sequencing;version="1.1.0",
>- org.eclipse.persistence.services;version="1.1.0",
>- org.eclipse.persistence.services.mbean;version="1.1.0",
>- org.eclipse.persistence.services.weblogic;version="1.1.0",
>- org.eclipse.persistence.sessions;version="1.1.0",
>- org.eclipse.persistence.sessions.broker;version="1.1.0",
>- org.eclipse.persistence.sessions.changesets;version="1.1.0",
>- org.eclipse.persistence.sessions.coordination;version="1.1.0",
>- org.eclipse.persistence.sessions.coordination.broadcast;version="1.1.0",
>- org.eclipse.persistence.sessions.coordination.corba;version="1.1.0",
>- org.eclipse.persistence.sessions.coordination.corba.sun;version="1.1.0",
>- org.eclipse.persistence.sessions.coordination.jms;version="1.1.0",
>- org.eclipse.persistence.sessions.coordination.rmi;version="1.1.0",
>- org.eclipse.persistence.sessions.factories;version="1.1.0",
>- org.eclipse.persistence.sessions.interceptors;version="1.1.0",
>- org.eclipse.persistence.sessions.remote;version="1.1.0",
>- org.eclipse.persistence.sessions.remote.corba.sun;version="1.1.0",
>- org.eclipse.persistence.sessions.remote.rmi;version="1.1.0",
>- org.eclipse.persistence.sessions.remote.rmi.iiop;version="1.1.0",
>- org.eclipse.persistence.sessions.server;version="1.1.0",
>- org.eclipse.persistence.tools;version="1.1.0",
>- org.eclipse.persistence.tools.file;version="1.1.0",
>- org.eclipse.persistence.tools.profiler;version="1.1.0",
>- org.eclipse.persistence.tools.schemaframework;version="1.1.0",
>- org.eclipse.persistence.transaction;version="1.1.0",
>- org.eclipse.persistence.transaction.jboss;version="1.1.0",
>- org.eclipse.persistence.transaction.oc4j;version="1.1.0",
>- org.eclipse.persistence.transaction.sunas;version="1.1.0",
>- org.eclipse.persistence.transaction.was;version="1.1.0",
>- org.eclipse.persistence.transaction.wls;version="1.1.0",
>- xsd;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Require-Bundle: org.eclipse.persistence.antlr;bundle-version="1.1.1";resolution:=optional,
>+ org.eclipse.persistence.asm;bundle-version="1.1.1";resolution:=optional
>+Export-Package: org.eclipse.persistence;version="1.1.1",
>+ org.eclipse.persistence.annotations;version="1.1.1",
>+ org.eclipse.persistence.config;version="1.1.1",
>+ org.eclipse.persistence.descriptors;version="1.1.1",
>+ org.eclipse.persistence.descriptors.changetracking;version="1.1.1",
>+ org.eclipse.persistence.descriptors.copying;version="1.1.1",
>+ org.eclipse.persistence.descriptors.invalidation;version="1.1.1",
>+ org.eclipse.persistence.eis;version="1.1.1",
>+ org.eclipse.persistence.eis.adapters.jms;version="1.1.1",
>+ org.eclipse.persistence.eis.adapters.xmlfile;version="1.1.1",
>+ org.eclipse.persistence.eis.interactions;version="1.1.1",
>+ org.eclipse.persistence.eis.mappings;version="1.1.1",
>+ org.eclipse.persistence.exceptions;version="1.1.1",
>+ org.eclipse.persistence.exceptions.i18n;version="1.1.1",
>+ org.eclipse.persistence.expressions;version="1.1.1",
>+ org.eclipse.persistence.expressions.spatial;version="1.1.1",
>+ org.eclipse.persistence.history;version="1.1.1",
>+ org.eclipse.persistence.indirection;version="1.1.1",
>+ org.eclipse.persistence.internal.codegen;version="1.1.1",
>+ org.eclipse.persistence.internal.databaseaccess;version="1.1.1",
>+ org.eclipse.persistence.internal.descriptors;version="1.1.1",
>+ org.eclipse.persistence.internal.descriptors.changetracking;version="1.1.1",
>+ org.eclipse.persistence.internal.dynamicpersist;version="1.1.1",
>+ org.eclipse.persistence.internal.eis.adapters.jms;version="1.1.1",
>+ org.eclipse.persistence.internal.eis.adapters.xmlfile;version="1.1.1",
>+ org.eclipse.persistence.internal.eis.cobol;version="1.1.1",
>+ org.eclipse.persistence.internal.eis.cobol.helper;version="1.1.1",
>+ org.eclipse.persistence.internal.expressions;version="1.1.1",
>+ org.eclipse.persistence.internal.helper;version="1.1.1",
>+ org.eclipse.persistence.internal.helper.linkedlist;version="1.1.1",
>+ org.eclipse.persistence.internal.history;version="1.1.1",
>+ org.eclipse.persistence.internal.identitymaps;version="1.1.1",
>+ org.eclipse.persistence.internal.indirection;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.parsing;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.parsing.jpql;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.parsing.jpql.antlr;version="1.1.1",
>+ org.eclipse.persistence.internal.localization;version="1.1.1",
>+ org.eclipse.persistence.internal.localization.i18n;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm.conversion;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm.documentpreservation;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm.record;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm.record.deferred;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm.schema;version="1.1.1",
>+ org.eclipse.persistence.internal.oxm.schema.model;version="1.1.1",
>+ org.eclipse.persistence.internal.platform.database;version="1.1.1",
>+ org.eclipse.persistence.internal.queries;version="1.1.1",
>+ org.eclipse.persistence.internal.security;version="1.1.1",
>+ org.eclipse.persistence.internal.sequencing;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination.broadcast;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination.corba;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination.corba.sun;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination.jms;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination.rmi;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.coordination.rmi.iiop;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.event;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.log;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.login;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.platform;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.pool;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.project;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.property;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.rcm;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.rcm.command;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.sequencing;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.session;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.transport;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.transport.discovery;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.factories.model.transport.naming;version="1.1.1",
>+ org.eclipse.persistence.internal.sessions.remote;version="1.1.1",
>+ org.eclipse.persistence.internal.weaving;version="1.1.1",
>+ org.eclipse.persistence.logging;version="1.1.1",
>+ org.eclipse.persistence.mappings;version="1.1.1",
>+ org.eclipse.persistence.mappings.converters;version="1.1.1",
>+ org.eclipse.persistence.mappings.foundation;version="1.1.1",
>+ org.eclipse.persistence.mappings.querykeys;version="1.1.1",
>+ org.eclipse.persistence.mappings.structures;version="1.1.1",
>+ org.eclipse.persistence.mappings.transformers;version="1.1.1",
>+ org.eclipse.persistence.mappings.xdb;version="1.1.1",
>+ org.eclipse.persistence.oxm;version="1.1.1",
>+ org.eclipse.persistence.oxm.annotations;version="1.1.1",
>+ org.eclipse.persistence.oxm.attachment;version="1.1.1",
>+ org.eclipse.persistence.oxm.documentpreservation;version="1.1.1",
>+ org.eclipse.persistence.oxm.mappings;version="1.1.1",
>+ org.eclipse.persistence.oxm.mappings.converters;version="1.1.1",
>+ org.eclipse.persistence.oxm.mappings.nullpolicy;version="1.1.1",
>+ org.eclipse.persistence.oxm.platform;version="1.1.1",
>+ org.eclipse.persistence.oxm.record;version="1.1.1",
>+ org.eclipse.persistence.oxm.schema;version="1.1.1",
>+ org.eclipse.persistence.oxm.sequenced;version="1.1.1",
>+ org.eclipse.persistence.oxm.unmapped;version="1.1.1",
>+ org.eclipse.persistence.platform.database;version="1.1.1",
>+ org.eclipse.persistence.platform.database.converters;version="1.1.1",
>+ org.eclipse.persistence.platform.database.jdbc;version="1.1.1",
>+ org.eclipse.persistence.platform.database.oracle.plsql;version="1.1.1",
>+ org.eclipse.persistence.platform.server;version="1.1.1",
>+ org.eclipse.persistence.platform.server.jboss;version="1.1.1",
>+ org.eclipse.persistence.platform.server.oc4j;version="1.1.1",
>+ org.eclipse.persistence.platform.server.sunas;version="1.1.1",
>+ org.eclipse.persistence.platform.server.was;version="1.1.1",
>+ org.eclipse.persistence.platform.server.wls;version="1.1.1",
>+ org.eclipse.persistence.platform.xml;version="1.1.1",
>+ org.eclipse.persistence.platform.xml.jaxp;version="1.1.1",
>+ org.eclipse.persistence.queries;version="1.1.1",
>+ org.eclipse.persistence.sequencing;version="1.1.1",
>+ org.eclipse.persistence.services;version="1.1.1",
>+ org.eclipse.persistence.services.mbean;version="1.1.1",
>+ org.eclipse.persistence.services.weblogic;version="1.1.1",
>+ org.eclipse.persistence.sessions;version="1.1.1",
>+ org.eclipse.persistence.sessions.broker;version="1.1.1",
>+ org.eclipse.persistence.sessions.changesets;version="1.1.1",
>+ org.eclipse.persistence.sessions.coordination;version="1.1.1",
>+ org.eclipse.persistence.sessions.coordination.broadcast;version="1.1.1",
>+ org.eclipse.persistence.sessions.coordination.corba;version="1.1.1",
>+ org.eclipse.persistence.sessions.coordination.corba.sun;version="1.1.1",
>+ org.eclipse.persistence.sessions.coordination.jms;version="1.1.1",
>+ org.eclipse.persistence.sessions.coordination.rmi;version="1.1.1",
>+ org.eclipse.persistence.sessions.factories;version="1.1.1",
>+ org.eclipse.persistence.sessions.interceptors;version="1.1.1",
>+ org.eclipse.persistence.sessions.remote;version="1.1.1",
>+ org.eclipse.persistence.sessions.remote.corba.sun;version="1.1.1",
>+ org.eclipse.persistence.sessions.remote.rmi;version="1.1.1",
>+ org.eclipse.persistence.sessions.remote.rmi.iiop;version="1.1.1",
>+ org.eclipse.persistence.sessions.server;version="1.1.1",
>+ org.eclipse.persistence.tools;version="1.1.1",
>+ org.eclipse.persistence.tools.file;version="1.1.1",
>+ org.eclipse.persistence.tools.profiler;version="1.1.1",
>+ org.eclipse.persistence.tools.schemaframework;version="1.1.1",
>+ org.eclipse.persistence.transaction;version="1.1.1",
>+ org.eclipse.persistence.transaction.jboss;version="1.1.1",
>+ org.eclipse.persistence.transaction.oc4j;version="1.1.1",
>+ org.eclipse.persistence.transaction.sunas;version="1.1.1",
>+ org.eclipse.persistence.transaction.was;version="1.1.1",
>+ org.eclipse.persistence.transaction.wls;version="1.1.1",
>+ xsd;version="1.1.1"
> Bundle-ClassPath: .
> Import-Package: javax.activation;version="1.1.0";resolution:=optional,
>  javax.jms;version="1.1.0";resolution:=optional,
>Index: foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/Version.java
>===================================================================
>--- foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/Version.java	(revision 3854)
>+++ foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/Version.java	(working copy)
>@@ -29,7 +29,9 @@
>     // This will be used by all product components and included in exceptions.
>     private static String product = "Eclipse Persistence Services";
>     private static final String version = "@VERSION@";
>+    // Should be in the format YYYYMMDD
>     private static final String buildDate = "@BUILD_DATE@";
>+    private static final String buildTime = "@BUILD_TIME@";
>     private static final String buildRevision = "@BUILD_REVISION@";
>     private static final String buildType = "@BUILD_TYPE@";
>  
>@@ -40,14 +42,10 @@
> 
>     public static String getVersionString ( ) {
>         String verString;
>-        if( getBuildType()=="RELEASE" ) {
>-            verString = getVersion() + ".r" + getBuildRevision();
>+        if( getBuildRevision()=="NA" ) {
>+            verString = getVersion() + ".qualifier";
>         }else {
>-            if( getBuildRevision()=="NA" ) {
>-                verString = getVersion() + "." + getBuildDate() + "-" + getBuildType();
>-            }else {
>-                verString = getVersion() + ".r" + getBuildRevision() + "-" + getBuildType();
>-            }
>+            verString = getVersion() + ".v" + getBuildDate() + "-r" + getBuildRevision();
>         }
>         return( verString );
>     }
>@@ -72,6 +70,10 @@
>         return buildDate;
>     }
> 
>+    public static String getBuildTime() {
>+        return buildTime;
>+    }
>+
>     public static String getBuildRevision() {
>         return buildRevision;
>     }
>Index: foundation/org.eclipse.persistence.oracle/build.xml
>===================================================================
>--- foundation/org.eclipse.persistence.oracle/build.xml	(revision 3854)
>+++ foundation/org.eclipse.persistence.oracle/build.xml	(working copy)
>@@ -55,10 +55,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>@@ -111,7 +112,7 @@
>     </target>
> 
>     <target name="package" description="jar OSGI bundles">
>-        <jar jarfile="${oracle.plugins.dir}/${eclipselink.extension.oracle.bndl.prefix}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${oracle.plugins.dir}/${eclipselink.extension.oracle.bndl.prefix}.jar" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${oracle.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -141,24 +142,26 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink Oracle Extensions${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport${line.separator}"       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence.eis.adapters.aq;version=&quot;${release.version}&quot;,${line.separator}"        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.eis.adapters.aq;version=&quot;${release.version}&quot;,${line.separator}"              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.platform.database.oracle;version=&quot;${release.version}&quot;,${line.separator}"     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.platform.database.oracle.xdb;version=&quot;${release.version}&quot;,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.database.oracle;version=&quot;${release.version}&quot;,${line.separator}"              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.database.oracle.converters;version=&quot;${release.version}&quot;,${line.separator}"   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.platform.xml.xdk;version=&quot;${release.version}&quot;${line.separator}"                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: javax.resource;version=&quot;1.5.0&quot;;resolution:=optional,${line.separator}"       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.resource.cci;version=&quot;1.5.0&quot;${line.separator}"                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"              file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                                                           file="${classes.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink Oracle Extensions${line.separator}"                                                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                                                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence.eis.adapters.aq;version=&quot;${release.version}&quot;,${line.separator}"                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.eis.adapters.aq;version=&quot;${release.version}&quot;,${line.separator}"                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.platform.database.oracle;version=&quot;${release.version}&quot;,${line.separator}"              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.platform.database.oracle.xdb;version=&quot;${release.version}&quot;,${line.separator}"          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.database.oracle;version=&quot;${release.version}&quot;,${line.separator}"                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.database.oracle.converters;version=&quot;${release.version}&quot;,${line.separator}"            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.platform.xml.xdk;version=&quot;${release.version}&quot;${line.separator}"                                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: javax.resource;version=&quot;1.5.0&quot;;resolution:=optional,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.resource.cci;version=&quot;1.5.0&quot;${line.separator}"                                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
> </project>
>Index: foundation/org.eclipse.persistence.oracle/META-INF/MANIFEST.MF
>===================================================================
>--- foundation/org.eclipse.persistence.oracle/META-INF/MANIFEST.MF	(revision 3854)
>+++ foundation/org.eclipse.persistence.oracle/META-INF/MANIFEST.MF	(working copy)
>@@ -2,15 +2,17 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink Oracle Extensions
> Bundle-SymbolicName: org.eclipse.persistence.oracle
>-Bundle-Version: 1.1.0
>-Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.0";visibility:=reexport
>-Export-Package: org.eclipse.persistence.eis.adapters.aq;version="1.1.0",
>- org.eclipse.persistence.internal.eis.adapters.aq;version="1.1.0",
>- org.eclipse.persistence.internal.platform.database.oracle;version="1.1.0",
>- org.eclipse.persistence.internal.platform.database.oracle.xdb;version="1.1.0",
>- org.eclipse.persistence.platform.database.oracle;version="1.1.0",
>- org.eclipse.persistence.platform.database.oracle.converters;version="1.1.0",
>- org.eclipse.persistence.platform.xml.xdk;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.1";visibility:=reexport
>+Export-Package: org.eclipse.persistence.eis.adapters.aq;version="1.1.1",
>+ org.eclipse.persistence.internal.eis.adapters.aq;version="1.1.1",
>+ org.eclipse.persistence.internal.platform.database.oracle;version="1.1.1",
>+ org.eclipse.persistence.internal.platform.database.oracle.xdb;version="1.1.1",
>+ org.eclipse.persistence.platform.database.oracle;version="1.1.1",
>+ org.eclipse.persistence.platform.database.oracle.converters;version="1.1.1",
>+ org.eclipse.persistence.platform.xml.xdk;version="1.1.1"
> Bundle-ClassPath: .
> Import-Package: javax.resource;version="1.5.0";resolution:=optional,
>  javax.resource.cci;version="1.5.0"
>Index: jpa/org.eclipse.persistence.jpa.equinox/build.properties
>===================================================================
>--- jpa/org.eclipse.persistence.jpa.equinox/build.properties	(revision 3854)
>+++ jpa/org.eclipse.persistence.jpa.equinox/build.properties	(working copy)
>@@ -1,4 +1,30 @@
>+custom=true
>+# Edit this property to "true" to enable debug attributes like lines, variables and source-filename
>+javac.debug=true
>+javac.debuglevel=lines,source
>+
>+# Edit this property when you would like to override the java version during testing
>+javac.version=1.5
>+
>+# Do not edit the variables below
>+# They may, however, be overridden in parent scripts
>+asm=org.eclipse.persistence.asm
>+antlr=org.eclipse.persistence.antlr
>+
>+eclipselink.core=../org.eclipse.persistence.core
>+eclipselink.core.trunk=../../foundation/org.eclipse.persistence.core
>+eclipselink.core.depend=javax.activation_1.1.0.jar,javax.resource_1.5.0.jar,javax.ejb_3.0.0.jar,javax.jms_1.1.0.jar,javax.xml.stream_1.0.0.jar,javax.transaction_1.1.0.jar,javax.mail_1.4.0.jar,javax.persistence_1.0.0.jar
>+
>+eclipselink.jpa=../org.eclipse.persistence.jpa
>+
>+plugins.dir=plugins
>+src.dir=src
>+classes.dir=classes
>+
>+output.. = bin/
>+bin.includes = .,\
>+               META-INF/,\
>+               classes/
> source.. = src/
>-output.. = bin/
>-bin.includes = META-INF/,\
>-               .
>+src.includes = META-INF/,\
>+               src/
>Index: jpa/org.eclipse.persistence.jpa/build.xml
>===================================================================
>--- jpa/org.eclipse.persistence.jpa/build.xml	(revision 3854)
>+++ jpa/org.eclipse.persistence.jpa/build.xml	(working copy)
>@@ -44,10 +44,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>@@ -95,7 +96,7 @@
> 
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${jpa.2.common.plugins.dir}/${eclipselink.jpa.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${jpa.2.common.plugins.dir}/${eclipselink.jpa.bndl.prefix}_${version.string}.jar" duplicate="preserve" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${jpa.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -109,7 +110,7 @@
>                 <include name="META-INF/services/javax.persistence.spi.PersistenceProvider"/>
>             </fileset>
>         </jar>
>-        <jar jarfile="${jpa.2.common.plugins.dir}/${eclipselink.jpa.bndl.prefix}.source_${version.string}.jar">
>+        <jar jarfile="${jpa.2.common.plugins.dir}/${eclipselink.jpa.bndl.prefix}.source_${version.string}.jar" duplicate="preserve">
>              <manifest>
>                 <attribute name="Bundle-ManifestVersion" value="2"/>
>                 <attribute name="Bundle-Name"            value="EclipseLink JPA Source"/>
>@@ -133,53 +134,55 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink JPA${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence.internal.jpa;version=&quot;${release.version}&quot;,${line.separator}"                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.deployment;version=&quot;${release.version}&quot;,${line.separator}"                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.deployment.osgi;version=&quot;${release.version}&quot;,${line.separator}"                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.deployment.xml.parser;version=&quot;${release.version}&quot;,${line.separator}"             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.jdbc;version=&quot;${release.version}&quot;,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata;version=&quot;${release.version}&quot;,${line.separator}"                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors;version=&quot;${release.version}&quot;,${line.separator}"                file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors.classes;version=&quot;${release.version}&quot;,${line.separator}"        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors.mappings;version=&quot;${release.version}&quot;,${line.separator}"       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors.objects;version=&quot;${release.version}&quot;,${line.separator}"        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.cache;version=&quot;${release.version}&quot;,${line.separator}"                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.changetracking;version=&quot;${release.version}&quot;,${line.separator}"           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.columns;version=&quot;${release.version}&quot;,${line.separator}"                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.converters;version=&quot;${release.version}&quot;,${line.separator}"               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.copypolicy;version=&quot;${release.version}&quot;,${line.separator}"               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.inheritance;version=&quot;${release.version}&quot;,${line.separator}"              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.listeners;version=&quot;${release.version}&quot;,${line.separator}"                file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.locking;version=&quot;${release.version}&quot;,${line.separator}"                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.queries;version=&quot;${release.version}&quot;,${line.separator}"                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.sequencing;version=&quot;${release.version}&quot;,${line.separator}"               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.tables;version=&quot;${release.version}&quot;,${line.separator}"                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.transformers;version=&quot;${release.version}&quot;,${line.separator}"             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.metadata.xml;version=&quot;${release.version}&quot;,${line.separator}"                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.jpa.transaction;version=&quot;${release.version}&quot;,${line.separator}"                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jpa;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jpa.osgi;version=&quot;${release.version}&quot;,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.tools.weaving.jpa;version=&quot;${release.version}&quot;${line.separator}"                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Activator: org.eclipse.persistence.jpa.osgi.Activator${line.separator}"                                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: javax.persistence;version=&quot;[1.99.0,2.1.0)&quot;,${line.separator}"                                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.persistence.spi;version=&quot;[1.99.0,2.1.0)&quot;,${line.separator}"                                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.transaction;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.apache.tools.ant;version=&quot;1.6.0&quot;;resolution:=optional,${line.separator}"                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.apache.tools.ant.types;version=&quot;1.6.0&quot;;resolution:=optional,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.osgi.framework;resolution:=optional,${line.separator}"                                                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.osgi.service.packageadmin;resolution:=optional,${line.separator}"                                                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.xml.sax;resolution:=optional,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.parsers;resolution:=optional,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.sql;resolution:=optional ${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-         <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink JPA${line.separator}"                                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence.internal.jpa;version=&quot;${release.version}&quot;,${line.separator}"                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.deployment;version=&quot;${release.version}&quot;,${line.separator}"                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.deployment.osgi;version=&quot;${release.version}&quot;,${line.separator}"                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.deployment.xml.parser;version=&quot;${release.version}&quot;,${line.separator}"             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.jdbc;version=&quot;${release.version}&quot;,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata;version=&quot;${release.version}&quot;,${line.separator}"                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors;version=&quot;${release.version}&quot;,${line.separator}"                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors.classes;version=&quot;${release.version}&quot;,${line.separator}"        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors.mappings;version=&quot;${release.version}&quot;,${line.separator}"       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.accessors.objects;version=&quot;${release.version}&quot;,${line.separator}"        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.cache;version=&quot;${release.version}&quot;,${line.separator}"                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.changetracking;version=&quot;${release.version}&quot;,${line.separator}"           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.columns;version=&quot;${release.version}&quot;,${line.separator}"                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.converters;version=&quot;${release.version}&quot;,${line.separator}"               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.copypolicy;version=&quot;${release.version}&quot;,${line.separator}"               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.inheritance;version=&quot;${release.version}&quot;,${line.separator}"              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.listeners;version=&quot;${release.version}&quot;,${line.separator}"                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.locking;version=&quot;${release.version}&quot;,${line.separator}"                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.queries;version=&quot;${release.version}&quot;,${line.separator}"                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.sequencing;version=&quot;${release.version}&quot;,${line.separator}"               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.tables;version=&quot;${release.version}&quot;,${line.separator}"                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.transformers;version=&quot;${release.version}&quot;,${line.separator}"             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.metadata.xml;version=&quot;${release.version}&quot;,${line.separator}"                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.jpa.transaction;version=&quot;${release.version}&quot;,${line.separator}"                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jpa;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jpa.osgi;version=&quot;${release.version}&quot;,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.tools.weaving.jpa;version=&quot;${release.version}&quot;${line.separator}"                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Activator: org.eclipse.persistence.jpa.osgi.Activator${line.separator}"                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: javax.persistence;version=&quot;[1.99.0,2.1.0)&quot;,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.persistence.spi;version=&quot;[1.99.0,2.1.0)&quot;,${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.transaction;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.apache.tools.ant;version=&quot;1.6.0&quot;;resolution:=optional,${line.separator}"                                           file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.apache.tools.ant.types;version=&quot;1.6.0&quot;;resolution:=optional,${line.separator}"                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.osgi.framework;resolution:=optional,${line.separator}"                                                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.osgi.service.packageadmin;resolution:=optional,${line.separator}"                                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.xml.sax;resolution:=optional,${line.separator}"                                                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.parsers;resolution:=optional,${line.separator}"                                                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.sql;resolution:=optional${line.separator}"                                                                                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
> </project>
>Index: jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF
>===================================================================
>--- jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF	(revision 3854)
>+++ jpa/org.eclipse.persistence.jpa/META-INF/MANIFEST.MF	(working copy)
>@@ -2,35 +2,37 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink JPA
> Bundle-SymbolicName: org.eclipse.persistence.jpa
>-Bundle-Version: 1.1.0
>-Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.0";visibility:=reexport
>-Export-Package: org.eclipse.persistence.internal.jpa;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.deployment;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.deployment.osgi;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.deployment.xml.parser;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.jdbc;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.accessors;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.accessors.classes;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.accessors.mappings;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.accessors.objects;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.cache;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.changetracking;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.columns;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.converters;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.copypolicy;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.inheritance;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.listeners;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.locking;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.queries;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.sequencing;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.tables;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.transformers;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.metadata.xml;version="1.1.0",
>- org.eclipse.persistence.internal.jpa.transaction;version="1.1.0",
>- org.eclipse.persistence.jpa;version="1.1.0",
>- org.eclipse.persistence.jpa.osgi;version="1.1.0",
>- org.eclipse.persistence.tools.weaving.jpa;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.1";visibility:=reexport
>+Export-Package: org.eclipse.persistence.internal.jpa;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.deployment;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.deployment.osgi;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.deployment.xml.parser;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.jdbc;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.accessors;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.accessors.classes;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.accessors.mappings;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.accessors.objects;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.cache;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.changetracking;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.columns;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.converters;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.copypolicy;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.inheritance;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.listeners;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.locking;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.queries;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.sequencing;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.tables;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.transformers;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.metadata.xml;version="1.1.1",
>+ org.eclipse.persistence.internal.jpa.transaction;version="1.1.1",
>+ org.eclipse.persistence.jpa;version="1.1.1",
>+ org.eclipse.persistence.jpa.osgi;version="1.1.1",
>+ org.eclipse.persistence.tools.weaving.jpa;version="1.1.1"
> Bundle-Activator: org.eclipse.persistence.jpa.osgi.Activator
> Bundle-ClassPath: .
> Import-Package: javax.persistence;version="[1.99.0,2.1.0)",
>@@ -42,5 +44,5 @@
>  org.osgi.service.packageadmin;resolution:=optional,
>  org.xml.sax;resolution:=optional,
>  javax.xml.parsers;resolution:=optional,
>- javax.sql;resolution:=optional 
>+ javax.sql;resolution:=optional
> HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.jpa
>Index: jpa/plugins/javax.persistence/build.xml
>===================================================================
>--- jpa/plugins/javax.persistence/build.xml	(revision 3854)
>+++ jpa/plugins/javax.persistence/build.xml	(working copy)
>@@ -38,13 +38,13 @@
>     </condition>
>     <property name="jpaproto.2.common.plugins.dir" value="${jpaproto.2.base.dir}/plugins"/>
> 
>-    <property name="jpaproto.version" value="1.99.0"/>
>-    <property name="jpaproto.jar"     value="${ant.project.name}_1.99.0.jar"/>
>-    <property name="jpaproto.src.jar" value="${ant.project.name}.source_1.99.0.jar"/>
>-    <property name="src.dir"          value="src"/>
>-    <property name="package.dir"      value=".."/>
>-    <property name="classes.dir"      value="classes"/>
>-    <property name="jpaproto.resource.dir"     value="META-INF"/>
>+    <property name="jpaproto.version"      value="1.99.0"/>
>+    <property name="jpaproto.jar"          value="${ant.project.name}_1.99.0.jar"/>
>+    <property name="jpaproto.src.jar"      value="${ant.project.name}.source_1.99.0.jar"/>
>+    <property name="src.dir"               value="src"/>
>+    <property name="package.dir"           value=".."/>
>+    <property name="classes.dir"           value="classes"/>
>+    <property name="jpaproto.resource.dir" value="META-INF"/>
> 
>     <property name="javac.debug"       value="true"/>
>     <property name="javac.optimize"    value="off"/>
>@@ -88,7 +88,7 @@
> 
>     
>     <target name="package" description="package ${ant.project.name}">
>-        <jar jarfile="${package.dir}/${jpaproto.jar}" manifest="${jpaproto.resource.dir}/MANIFEST.MF">
>+        <jar jarfile="${package.dir}/${jpaproto.jar}" duplicate="preserve" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${jpaproto.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -101,14 +101,14 @@
>                 includes="**/*.xsd"
>             />
>             <fileset dir="${classes.dir}"
>-                includes="**"
>+                includes="**/*.class"
>             />
>             <fileset dir="${jpaproto.resource.dir}"
>                 includes="**"
>                 excludes="MANIFEST.MF"
>             />
>         </jar>
>-        <jar jarfile="${package.dir}/${jpaproto.src.jar}">
>+        <jar jarfile="${package.dir}/${jpaproto.src.jar}" duplicate="preserve">
>             <manifest>
>                 <attribute name="Bundle-ManifestVersion" value="2"/>
>                 <attribute name="Bundle-Name"            value="EclipseLink's javax.persistence 1.99 Library Source"/>
>@@ -131,18 +131,20 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="${jpaproto.resource.dir}/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${jpaproto.resource.dir}/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: JPA 1.99 - Extended for OSGi${line.separator}"                                       file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                     file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${jpaproto.version}${line.separator}"                                        file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: javax.persistence;version=&quot;${jpaproto.version}&quot;,${line.separator}" file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.persistence.spi;version=&quot;${jpaproto.version}&quot;${line.separator}"             file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Activator: javax.persistence.osgi.Activator${line.separator}"                         file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                        file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: org.osgi.framework;resolution:=optional,${line.separator}"                   file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>-        <echo message=" org.osgi.util.tracker;resolution:=optional${line.separator}"                                file="${jpaproto.resource.dir}/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: JPA 1.99 - Extended for OSGi${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${jpaproto.version}${line.separator}"                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: javax.persistence;version=&quot;${jpaproto.version}&quot;,${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.persistence.spi;version=&quot;${jpaproto.version}&quot;${line.separator}"             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Activator: javax.persistence.osgi.Activator${line.separator}"                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: org.osgi.framework;resolution:=optional,${line.separator}"                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.osgi.util.tracker;resolution:=optional${line.separator}"                                file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
> </project>
>\ No newline at end of file
>Index: jpa/plugins/javax.persistence/META-INF/MANIFEST.MF
>===================================================================
>--- jpa/plugins/javax.persistence/META-INF/MANIFEST.MF	(revision 3854)
>+++ jpa/plugins/javax.persistence/META-INF/MANIFEST.MF	(working copy)
>@@ -2,7 +2,9 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: JPA 1.99 - Extended for OSGi
> Bundle-SymbolicName: javax.persistence
>+Bundle-Vendor: EclipseLink Project
> Bundle-Version: 1.99.0
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: javax.persistence;version="1.99.0",
>  javax.persistence.spi;version="1.99.0"
> Bundle-Activator: javax.persistence.osgi.Activator
>Index: jpa/plugins/javax.persistence_1.99.0.jar
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>Index: moxy/org.eclipse.persistence.moxy/build.xml
>===================================================================
>--- moxy/org.eclipse.persistence.moxy/build.xml	(revision 3854)
>+++ moxy/org.eclipse.persistence.moxy/build.xml	(working copy)
>@@ -57,10 +57,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>@@ -109,7 +110,7 @@
> 
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${moxy.2.common.plugins.dir}/${eclipselink.moxy.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${moxy.2.common.plugins.dir}/${eclipselink.moxy.bndl.prefix}_${version.string}.jar" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${moxy.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -139,34 +140,36 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">                                                                                                               
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>                                                                                                                                                         
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>                                                   
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>                                                    
>-        <echo message="Bundle-Name: EclipseLink MOXy${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>                                                   
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>                                                    
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>                                                    
>-        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>              
>-        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>              
>-        <echo message="Export-Package: org.eclipse.persistence.internal.jaxb;version=&quot;${release.version}&quot;,${line.separator}"                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jaxb;version=&quot;${release.version}&quot;,${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jaxb.attachment;version=&quot;${release.version}&quot;,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jaxb.compiler;version=&quot;${release.version}&quot;,${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jaxb.javamodel;version=&quot;${release.version}&quot;,${line.separator}"                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.jaxb.javamodel.reflection;version=&quot;${release.version}&quot;${line.separator}"                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: javax.activation;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.mail;version=&quot;1.4.0&quot;;resolution:=optional,${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.bind;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.bind.annotation;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.bind.annotation.adapters;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.bind.attachment;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                       file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.bind.helpers;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.bind.util;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.soap;version=&quot;1.3.0&quot;;resolution:=optional,${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.stream;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                                file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.stream.events;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" javax.xml.stream.util;version=&quot;1.0.0&quot;;resolution:=optional${line.separator}"                                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>                                                                                                                                                         
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="false"/>                                                   
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>                                                    
>+        <echo message="Bundle-Name: EclipseLink MOXy${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>                                                   
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>                                                    
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>                                                    
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport,${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>              
>+        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>              
>+        <echo message="Export-Package: org.eclipse.persistence.internal.jaxb;version=&quot;${release.version}&quot;,${line.separator}"                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jaxb;version=&quot;${release.version}&quot;,${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jaxb.attachment;version=&quot;${release.version}&quot;,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jaxb.compiler;version=&quot;${release.version}&quot;,${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jaxb.javamodel;version=&quot;${release.version}&quot;,${line.separator}"                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.jaxb.javamodel.reflection;version=&quot;${release.version}&quot;${line.separator}"                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: javax.activation;version=&quot;1.1.0&quot;;resolution:=optional,${line.separator}"                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.mail;version=&quot;1.4.0&quot;;resolution:=optional,${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.bind;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.bind.annotation;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.bind.annotation.adapters;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.bind.attachment;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                       file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.bind.helpers;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.bind.util;version=&quot;2.0.0&quot;;resolution:=optional,${line.separator}"                                             file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.soap;version=&quot;1.3.0&quot;;resolution:=optional,${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.stream;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                                file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.stream.events;version=&quot;1.0.0&quot;;resolution:=optional,${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" javax.xml.stream.util;version=&quot;1.0.0&quot;;resolution:=optional${line.separator}"                                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
> </project>
>\ No newline at end of file
>Index: moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF
>===================================================================
>--- moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF	(revision 3854)
>+++ moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF	(working copy)
>@@ -2,15 +2,17 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink MOXy
> Bundle-SymbolicName: org.eclipse.persistence.moxy
>-Bundle-Version: 1.1.0
>-Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.0";visibility:=reexport,
>- org.eclipse.persistence.asm;bundle-version="1.1.0"
>-Export-Package: org.eclipse.persistence.internal.jaxb;version="1.1.0",
>- org.eclipse.persistence.jaxb;version="1.1.0",
>- org.eclipse.persistence.jaxb.attachment;version="1.1.0",
>- org.eclipse.persistence.jaxb.compiler;version="1.1.0",
>- org.eclipse.persistence.jaxb.javamodel;version="1.1.0",
>- org.eclipse.persistence.jaxb.javamodel.reflection;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.1";visibility:=reexport,
>+ org.eclipse.persistence.asm;bundle-version="1.1.1"
>+Export-Package: org.eclipse.persistence.internal.jaxb;version="1.1.1",
>+ org.eclipse.persistence.jaxb;version="1.1.1",
>+ org.eclipse.persistence.jaxb.attachment;version="1.1.1",
>+ org.eclipse.persistence.jaxb.compiler;version="1.1.1",
>+ org.eclipse.persistence.jaxb.javamodel;version="1.1.1",
>+ org.eclipse.persistence.jaxb.javamodel.reflection;version="1.1.1"
> Bundle-ClassPath: .
> Import-Package: javax.activation;version="1.1.0";resolution:=optional,
>  javax.mail;version="1.4.0";resolution:=optional,
>Index: plugins/org.eclipse.persistence.antlr/build.xml
>===================================================================
>--- plugins/org.eclipse.persistence.antlr/build.xml	(revision 3854)
>+++ plugins/org.eclipse.persistence.antlr/build.xml	(working copy)
>@@ -39,22 +39,25 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>-    <property name="release.version" value="1.1.1"/>
>-    <property name="build.type" value="SNAPSHOT"/>
>-    <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>-    <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
>+    <property name="release.version"     value="1.1.1"/>
>+    <property name="build.type"          value="SNAPSHOT"/>
>+    <property name="svn.revision"        value="NA"/>
>+    <property name="version.string"      value="${release.version}.qualifier"/>
>+    <property name="release.designation" value="EclipseLink DeveloperBuild"/>
> 
>     <property name="eclipselink.antlr.bndl.prefix" value="${ant.project.name}"/>
>-    <property name="src.dir"         value="src"/>
>-    <property name="antlr.classes.dir"     value="."/>
>+    <property name="src.dir"                       value="src"/>
>+    <property name="antlr.classes.dir"             value="."/>
>+    <property name="temp.dir"                   value="${antlr.classes.dir}/tmp"/>
> 
>     
>     <target name="build" depends="clean, generate-manifest, package" description="build antlr"/>
> 
>     
>     <target name="clean" description="Clean the build">
>+        <delete dir="temp.dir" quiet="true"/>
>         <delete includeEmptyDirs="true" failonerror="false">
>             <fileset dir="${antlr.2.common.plugins.dir}" includes="${eclipselink.antlr.bndl.prefix}*.jar"/>
>        </delete>
>@@ -62,7 +65,7 @@
>     
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${antlr.2.common.plugins.dir}/${eclipselink.antlr.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${antlr.2.common.plugins.dir}/${eclipselink.antlr.bndl.prefix}_${version.string}.jar" manifest="${temp.dir}/MANIFEST.MF">
>             <fileset dir="${antlr.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -92,16 +95,19 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink ANTLR${line.separator}"                                             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence.internal.libraries.antlr.runtime;version=&quot;${release.version}&quot;,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.antlr.runtime.tree;version=&quot;${release.version}&quot;${line.separator}"            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${temp.dir}/MANIFEST.MF" quiet="true"/>
>+        <mkdir dir="${temp.dir}"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                                                            file="${temp.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                                                        file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink ANTLR${line.separator}"                                                                                   file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                                                         file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                                                               file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                                                               file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                    file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence.internal.libraries.antlr.runtime;version=&quot;${release.version}&quot;,${line.separator}" file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.antlr.runtime.tree;version=&quot;${release.version}&quot;${line.separator}"            file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                              file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="${temp.dir}/MANIFEST.MF" append="true"/>
>     </target>
>     
> </project>
>\ No newline at end of file
>Index: plugins/org.eclipse.persistence.antlr/META-INF/MANIFEST.MF
>===================================================================
>--- plugins/org.eclipse.persistence.antlr/META-INF/MANIFEST.MF	(revision 3854)
>+++ plugins/org.eclipse.persistence.antlr/META-INF/MANIFEST.MF	(working copy)
>@@ -2,8 +2,10 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink ANTLR
> Bundle-SymbolicName: org.eclipse.persistence.antlr
>-Bundle-Version: 1.1.0
>-Export-Package: org.eclipse.persistence.internal.libraries.antlr.runtime;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.antlr.runtime.tree;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Export-Package: org.eclipse.persistence.internal.libraries.antlr.runtime;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.antlr.runtime.tree;version="1.1.1"
> Bundle-ClassPath: .
> HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.antlr
>Index: plugins/org.eclipse.persistence.asm/build.xml
>===================================================================
>--- plugins/org.eclipse.persistence.asm/build.xml	(revision 3854)
>+++ plugins/org.eclipse.persistence.asm/build.xml	(working copy)
>@@ -39,22 +39,25 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>-    <property name="release.version" value="1.1.1"/>
>-    <property name="build.type" value="SNAPSHOT"/>
>-    <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>-    <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
>+    <property name="release.version"     value="1.1.1"/>
>+    <property name="build.type"          value="SNAPSHOT"/>
>+    <property name="svn.revision"        value="NA"/>
>+    <property name="version.string"      value="${release.version}.qualifier"/>
>+    <property name="release.designation" value="EclipseLink DeveloperBuild"/>
> 
>     <property name="eclipselink.asm.bndl.prefix" value="${ant.project.name}"/>
>-    <property name="src.dir"         value="src"/>
>-    <property name="asm.classes.dir" value="."/>
>+    <property name="src.dir"                     value="src"/>
>+    <property name="asm.classes.dir"             value="."/>
>+    <property name="temp.dir"                 value="${asm.classes.dir}/tmp"/>
> 
>     
>     <target name="build" depends="clean, generate-manifest, package" description="build asm"/>
> 
>     
>-    <target name="clean" description="clean the build">
>+    <target name="clean" description="Clean the build">
>+        <delete dir="temp.dir" quiet="true"/>
>         <delete includeEmptyDirs="true" failonerror="false">
>             <fileset dir="${asm.2.common.plugins.dir}" includes="${eclipselink.asm.bndl.prefix}*.jar"/>
>        </delete>
>@@ -62,7 +65,7 @@
>     
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${asm.2.common.plugins.dir}/${eclipselink.asm.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${asm.2.common.plugins.dir}/${eclipselink.asm.bndl.prefix}_${version.string}.jar" manifest="${temp.dir}/MANIFEST.MF">
>             <fileset dir="${asm.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -92,22 +95,25 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink ASM${line.separator}"                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence.internal.libraries.asm;version=&quot;${release.version}&quot;,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.attrs;version=&quot;${release.version}&quot;,${line.separator}"          file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.commons;version=&quot;${release.version}&quot;,${line.separator}"        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.tree;version=&quot;${release.version}&quot;,${line.separator}"           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.tree.analysis;version=&quot;${release.version}&quot;,${line.separator}"  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.util;version=&quot;${release.version}&quot;,${line.separator}"           file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.util.attrs;version=&quot;${release.version}&quot;,${line.separator}"     file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.internal.libraries.asm.xml;version=&quot;${release.version}&quot;${line.separator}"             file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                    file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                           file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${temp.dir}/MANIFEST.MF" quiet="true"/>
>+        <mkdir dir="${temp.dir}"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                                                  file="${temp.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                                              file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink ASM${line.separator}"                                                                           file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                                               file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                                                     file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                                                     file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                          file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence.internal.libraries.asm;version=&quot;${release.version}&quot;,${line.separator}" file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.attrs;version=&quot;${release.version}&quot;,${line.separator}"          file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.commons;version=&quot;${release.version}&quot;,${line.separator}"        file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.tree;version=&quot;${release.version}&quot;,${line.separator}"           file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.tree.analysis;version=&quot;${release.version}&quot;,${line.separator}"  file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.util;version=&quot;${release.version}&quot;,${line.separator}"           file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.util.attrs;version=&quot;${release.version}&quot;,${line.separator}"     file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.internal.libraries.asm.xml;version=&quot;${release.version}&quot;${line.separator}"             file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                    file="${temp.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                           file="${temp.dir}/MANIFEST.MF" append="true"/>
>     </target>
>     
> </project>
>\ No newline at end of file
>Index: plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF
>===================================================================
>--- plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF	(revision 3854)
>+++ plugins/org.eclipse.persistence.asm/META-INF/MANIFEST.MF	(working copy)
>@@ -2,14 +2,16 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink ASM
> Bundle-SymbolicName: org.eclipse.persistence.asm
>-Bundle-Version: 1.1.0
>-Export-Package: org.eclipse.persistence.internal.libraries.asm;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.attrs;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.commons;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.tree;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.tree.analysis;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.util;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.util.attrs;version="1.1.0",
>- org.eclipse.persistence.internal.libraries.asm.xml;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Export-Package: org.eclipse.persistence.internal.libraries.asm;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.attrs;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.commons;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.tree;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.tree.analysis;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.util;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.util.attrs;version="1.1.1",
>+ org.eclipse.persistence.internal.libraries.asm.xml;version="1.1.1"
> Bundle-ClassPath: .
> HK2-Bundle-Name: org.eclipse.persistence:org.eclipse.persistence.asm
>Index: sdo/eclipselink.sdo.test/build.xml
>===================================================================
>--- sdo/eclipselink.sdo.test/build.xml	(revision 3854)
>+++ sdo/eclipselink.sdo.test/build.xml	(working copy)
>@@ -56,10 +56,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>Index: sdo/org.eclipse.persistence.sdo/build.xml
>===================================================================
>--- sdo/org.eclipse.persistence.sdo/build.xml	(revision 3854)
>+++ sdo/org.eclipse.persistence.sdo/build.xml	(working copy)
>@@ -47,10 +47,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>@@ -98,7 +99,7 @@
> 
>     
>     <target name="package" description="jar OSGI bundle">
>-        <jar jarfile="${sdo.2.common.plugins.dir}/${eclipselink.sdo.bndl.prefix}_${version.string}.jar" manifest="META-INF/MANIFEST.MF">
>+        <jar jarfile="${sdo.2.common.plugins.dir}/${eclipselink.sdo.bndl.prefix}_${version.string}.jar" manifest="${classes.dir}/MANIFEST.MF">
>             <fileset dir="${sdo.2.base.dir}">
>                 <include name="about.html"/>
>                 <include name="readme.html"/>
>@@ -130,25 +131,27 @@
>     </target>
> 
>     <target name="generate-manifest" description="Generate the OSGi bundle manifest before jarring">
>-        <delete file="META-INF/MANIFEST.MF" quiet="true"/>
>-        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="META-INF/MANIFEST.MF" append="false"/>
>-        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Name: EclipseLink SDO${line.separator}"                                               file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-Version: ${release.version}${line.separator}"                                         file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport,${line.separator}" file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.moxy;bundle-version=&quot;${release.version}&quot;;resolution:=optional${line.separator}"                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Export-Package: org.eclipse.persistence.sdo;version=&quot;${release.version}&quot;,${line.separator}"                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sdo.helper;version=&quot;${release.version}&quot;,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sdo.helper.delegates;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sdo.helper.extension;version=&quot;${release.version}&quot;,${line.separator}"                            file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" org.eclipse.persistence.sdo.types;version=&quot;${release.version}&quot;${line.separator}"                                        file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="Import-Package: commonj.sdo;version=&quot;2.1.1&quot;;resolution:=optional,${line.separator}"                                      file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" commonj.sdo.helper;version=&quot;2.1.1&quot;;resolution:=optional,${line.separator}"                                              file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message=" commonj.sdo.impl;version=&quot;2.1.1&quot;;resolution:=optional${line.separator}"                                                 file="META-INF/MANIFEST.MF" append="true"/>
>-        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="META-INF/MANIFEST.MF" append="true"/>
>+        <delete file="${classes.dir}/MANIFEST.MF" quiet="true"/>
>+        <echo message="Manifest-Version: 1.0${line.separator}"                                                      file="${classes.dir}/MANIFEST.MF" append="false"/>
>+        <echo message="Bundle-ManifestVersion: 2${line.separator}"                                                  file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Name: EclipseLink SDO${line.separator}"                                               file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-SymbolicName: ${ant.project.name}${line.separator}"                                   file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Vendor: EclipseLink Project${line.separator}"                                         file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-Version: ${release.version}${line.separator}"                                          file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-RequiredExecutionEnvironment: J2SE-1.5${line.separator}"                                                                    file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Require-Bundle: org.eclipse.persistence.core;bundle-version=&quot;${release.version}&quot;;visibility:=reexport,${line.separator}" file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.asm;bundle-version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.moxy;bundle-version=&quot;${release.version}&quot;;resolution:=optional${line.separator}"                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Export-Package: org.eclipse.persistence.sdo;version=&quot;${release.version}&quot;,${line.separator}"                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sdo.helper;version=&quot;${release.version}&quot;,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sdo.helper.delegates;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sdo.helper.extension;version=&quot;${release.version}&quot;,${line.separator}"                            file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" org.eclipse.persistence.sdo.types;version=&quot;${release.version}&quot;${line.separator}"                                        file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Bundle-ClassPath: .${line.separator}"                                                                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="Import-Package: commonj.sdo;version=&quot;2.1.1&quot;;resolution:=optional,${line.separator}"                                      file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" commonj.sdo.helper;version=&quot;2.1.1&quot;;resolution:=optional,${line.separator}"                                              file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message=" commonj.sdo.impl;version=&quot;2.1.1&quot;;resolution:=optional${line.separator}"                                                 file="${classes.dir}/MANIFEST.MF" append="true"/>
>+        <echo message="HK2-Bundle-Name: org.eclipse.persistence:${ant.project.name}${line.separator}"                                                     file="${classes.dir}/MANIFEST.MF" append="true"/>
>     </target>
> 
>     <target name="build_sdo_lib_jar" depends="compile-sdo-lib, package-sdo-lib-jar" description="Build SDO API lib"/>
>@@ -177,12 +180,14 @@
>         <echo message="Implementation-Version: ${version.string}"/>
>         <jar jarfile="../plugins/${commonj.sdo.jar}">
>              <manifest>
>-                <attribute name="Manifest-Version"    value="1.0"/>
>-                <attribute name="Bundle-ManifestVersion"   value="2"/>
>-                <attribute name="Bundle-Name"  value="SDO"/>
>-                <attribute name="Bundle-SymbolicName"   value="commonj.sdo"/>
>-                <attribute name="Bundle-Version"  value="2.1.1"/>
>-                <attribute name="Export-Package" value="${osgi.export.package}"/>
>+                <attribute name="Manifest-Version"                    value="1.0"/>
>+                <attribute name="Bundle-ManifestVersion"              value="2"/>
>+                <attribute name="Bundle-Name"                         value="SDO"/>
>+                <attribute name="Bundle-Vendor"                       value="EclipseLink Project"/>
>+                <attribute name="Bundle-SymbolicName"                 value="commonj.sdo"/>
>+                <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.5"/>
>+                <attribute name="Bundle-Version"                      value="2.1.1"/>
>+                <attribute name="Export-Package"                      value="${osgi.export.package}"/>
>             </manifest>
>             <fileset
>                 dir="../plugins/${commonj.sdo.dir}/${classes.dir}"
>Index: sdo/org.eclipse.persistence.sdo/META-INF/MANIFEST.MF
>===================================================================
>--- sdo/org.eclipse.persistence.sdo/META-INF/MANIFEST.MF	(revision 3854)
>+++ sdo/org.eclipse.persistence.sdo/META-INF/MANIFEST.MF	(working copy)
>@@ -2,15 +2,17 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: EclipseLink SDO
> Bundle-SymbolicName: org.eclipse.persistence.sdo
>-Bundle-Version: 1.1.0
>-Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.0";visibility:=reexport,
>- org.eclipse.persistence.asm;bundle-version="1.1.0",
>- org.eclipse.persistence.moxy;bundle-version="1.1.0";resolution:=optional
>-Export-Package: org.eclipse.persistence.sdo;version="1.1.0",
>- org.eclipse.persistence.sdo.helper;version="1.1.0",
>- org.eclipse.persistence.sdo.helper.delegates;version="1.1.0",
>- org.eclipse.persistence.sdo.helper.extension;version="1.1.0",
>- org.eclipse.persistence.sdo.types;version="1.1.0"
>+Bundle-Vendor: EclipseLink Project
>+Bundle-Version: 1.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Require-Bundle: org.eclipse.persistence.core;bundle-version="1.1.1";visibility:=reexport,
>+ org.eclipse.persistence.asm;bundle-version="1.1.1",
>+ org.eclipse.persistence.moxy;bundle-version="1.1.1";resolution:=optional
>+Export-Package: org.eclipse.persistence.sdo;version="1.1.1",
>+ org.eclipse.persistence.sdo.helper;version="1.1.1",
>+ org.eclipse.persistence.sdo.helper.delegates;version="1.1.1",
>+ org.eclipse.persistence.sdo.helper.extension;version="1.1.1",
>+ org.eclipse.persistence.sdo.types;version="1.1.1"
> Bundle-ClassPath: .
> Import-Package: commonj.sdo;version="2.1.1";resolution:=optional,
>  commonj.sdo.helper;version="2.1.1";resolution:=optional,
>Index: sdo/plugins/commonj.sdo_2.1.1/META-INF/MANIFEST.MF
>===================================================================
>--- sdo/plugins/commonj.sdo_2.1.1/META-INF/MANIFEST.MF	(revision 3854)
>+++ sdo/plugins/commonj.sdo_2.1.1/META-INF/MANIFEST.MF	(working copy)
>@@ -4,7 +4,9 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: SDO
> Bundle-SymbolicName: commonj.sdo
>+Bundle-Vendor: EclipseLink Project
> Bundle-Version: 2.1.1
>+Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Export-Package: commonj.sdo;version="2.1.1",commonj.sdo.helper;version
>  ="2.1.1",commonj.sdo.impl;version="2.1.1"
> 
>Index: uploadDepsToMaven.xml
>===================================================================
>--- uploadDepsToMaven.xml	(revision 3854)
>+++ uploadDepsToMaven.xml	(working copy)
>@@ -42,6 +42,7 @@
>     <target name = "upload-maven-init">
>         <tstamp>
>             <format property="build.date" pattern="yyyyMMdd"/>
>+            <format property="build.time" pattern="HHmm"/>
>         </tstamp>
> 
>         
>Index: uploadToMaven.xml
>===================================================================
>--- uploadToMaven.xml	(revision 3854)
>+++ uploadToMaven.xml	(working copy)
>@@ -60,13 +60,10 @@
>         
>         
>         
>-        <condition property="version.string" value="${release.version}.${build.date}-${build.type}">
>+        <condition property="version.string" value="${release.version}.qualifier" 
>+                                              else="${release.version}.v${build.date}-r${svn.revision}">
>             <equals arg1="${svn.revision}" arg2="NA"/>
>         </condition>
>-        <condition property="version.string" value="${release.version}.r${svn.revision}">
>-            <equals arg1="${build.type}" arg2="RELEASE"/>
>-        </condition>
>-        <property name="version.string" value="${release.version}.r${svn.revision}-${build.type}"/>
> 
>         
>         
>Index: utils/eclipselink.utils.dbws.test/build.xml
>===================================================================
>--- utils/eclipselink.utils.dbws.test/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.dbws.test/build.xml	(working copy)
>@@ -58,10 +58,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>Index: utils/eclipselink.utils.dbws/build.xml
>===================================================================
>--- utils/eclipselink.utils.dbws/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.dbws/build.xml	(working copy)
>@@ -53,10 +53,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>Index: utils/eclipselink.utils.rename/build.xml
>===================================================================
>--- utils/eclipselink.utils.rename/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.rename/build.xml	(working copy)
>@@ -37,10 +37,11 @@
>     
>     <tstamp>
>        <format property="build.date" pattern="yyyyMMdd"/>
>+       <format property="build.time" pattern="HHmm"/>
>     </tstamp>
>     <property name="build.type" value="SNAPSHOT"/>
>     <property name="svn.revision" value="NA"/>
>-    <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+    <property name="version.string" value="${release.version}.qualifier"/>
>     <property name="release.designation"  value="EclipseLink DeveloperBuild"/>
> 
>     
>Index: utils/eclipselink.utils.rename/package-rename.jar
>===================================================================
>Cannot display: file marked as a binary type.
>svn:mime-type = application/octet-stream
>Index: utils/eclipselink.utils.workbench.test/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/build.xml	(working copy)
>@@ -73,7 +73,7 @@
>         <tstamp>
>             <format property="_TodayMD" pattern="MMdd"/>
>             <format property="_TodayDMonthY" pattern="dd, MMMMM yyyy"/>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>Index: utils/eclipselink.utils.workbench.test/framework/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/framework/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/framework/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>         <condition property="junit.classpath.exist" >
>Index: utils/eclipselink.utils.workbench.test/mappingsplugin/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/mappingsplugin/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/mappingsplugin/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>         <condition property="junit.classpath.exist" >
>Index: utils/eclipselink.utils.workbench.test/platformsplugin/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/platformsplugin/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/platformsplugin/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>         <condition property="junit.classpath.exist" >
>Index: utils/eclipselink.utils.workbench.test/scplugin/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/scplugin/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/scplugin/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>         <condition property="junit.classpath.exist" >
>Index: utils/eclipselink.utils.workbench.test/uitools/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/uitools/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/uitools/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>         <condition property="junit.classpath.exist" >
>Index: utils/eclipselink.utils.workbench.test/utility/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench.test/utility/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench.test/utility/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>         <condition property="junit.classpath.exist" >
>Index: utils/eclipselink.utils.workbench/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/build.xml	(working copy)
>@@ -89,7 +89,7 @@
>         <tstamp>
>             <format property="_TodayMD" pattern="MMdd"/>
>             <format property="_TodayDMonthY" pattern="dd, MMMMM yyyy"/>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>             <format property="CurYear" pattern="yyyy"/>
>         </tstamp>
>@@ -103,7 +103,7 @@
> 
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         
>         <echo message="release.designation='${release.designation}'"/>
>         <echo message="BuildDate.BuildTime='${build.date}.${build.time}'"/>
>Index: utils/eclipselink.utils.workbench/framework/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/framework/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/framework/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -81,7 +81,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/iconlib/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/iconlib/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/iconlib/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>Index: utils/eclipselink.utils.workbench/mappingsio/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/mappingsio/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/mappingsio/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -80,7 +80,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/mappingsmodel/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/mappingsmodel/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/mappingsmodel/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -80,7 +80,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/mappingsplugin/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/mappingsplugin/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/mappingsplugin/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -82,7 +82,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/platformsmodel/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/platformsmodel/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/platformsmodel/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -80,7 +80,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/platformsplugin/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/platformsplugin/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/platformsplugin/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/scplugin/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/scplugin/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/scplugin/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -81,7 +81,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/uitools/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/uitools/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/uitools/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -81,7 +81,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>
>Index: utils/eclipselink.utils.workbench/utility/build.xml
>===================================================================
>--- utils/eclipselink.utils.workbench/utility/build.xml	(revision 3854)
>+++ utils/eclipselink.utils.workbench/utility/build.xml	(working copy)
>@@ -28,7 +28,7 @@
>     
>     <target name="init">
>         <tstamp>
>-            <format property="build.date" pattern="yyMMdd"/>
>+            <format property="build.date" pattern="yyyyMMdd"/>
>             <format property="build.time" pattern="HHmm"/>
>         </tstamp>
>         <property environment="env"/>
>@@ -79,7 +79,7 @@
>         <property file="build.properties"/>
>         <property name="build.type" value="SNAPSHOT"/>
>         <property name="release.designation" value="EclipseLink DeveloperBuild"/>
>-        <property name="version.string" value="${release.version}.${build.date}-${build.type}"/>
>+        <property name="version.string" value="${release.version}.qualifier"/>
>         <mkdir dir="${_classesDestDir}"/>
>         <mkdir dir="${_jarDestDir}"/>
>     </target>

Actions: View | Diff

Attachments on bug 263360: 131008 | 131010