[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.7_exp-5-22-g73c909a

Benjamin Drung bdrung at alioth.debian.org
Tue Sep 20 13:18:32 UTC 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  73c909ab58e08ac19f7f3a520bbe81aa58678638 (commit)
       via  c727071887a9572c3bbb044c3a5f1849dd6d9f98 (commit)
       via  4ea22bab20e45a2ec16088e3ce009b64707d5b88 (commit)
       via  6817be7dcafc0e9c265d907b608db05db8453870 (commit)
       via  e465b77a03c0e9da989675692ecbfa891da76a95 (commit)
       via  0cee7f164bfc414a9b6bc01920a11461c10fb36f (commit)
       via  96a56c9ad40ede3d15ae886da54bb794729b6146 (commit)
       via  cc3c0aaa1782d5e0d796483d921bdb8452310c54 (commit)
       via  6ef87a348279bd405df925c6704ce52bb7a618db (commit)
       via  bf307b0d98ba052f0cf4bb44de4da23c5608915b (commit)
       via  5b119db365bb13822ad61f162240c0b4ddaf5a52 (commit)
       via  7a475a199aaa8681c9a0e67555fce5c58dd1fc76 (commit)
       via  758b27a81c2d18e86981b49d2a8e9fb27c74d206 (commit)
       via  73c95c9039d0356cc3fca07a25b46b8061642906 (commit)
       via  72f7805beff972788417ae170ba812877f60d051 (commit)
       via  47cbbaa55938dcd5e262c29cd17cc4ab9279d440 (commit)
       via  63fc4f83fba96e2af186c981cf4e5d9ec1bfaf92 (commit)
      from  01a29407301f7fb0812cbeecb8b1c2b83df3a7e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 73c909ab58e08ac19f7f3a520bbe81aa58678638
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:48:39 2011 +0200

    Correct short license name.

commit c727071887a9572c3bbb044c3a5f1849dd6d9f98
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:44:05 2011 +0200

    Switch from bzip2 to xz source tarball.

commit 4ea22bab20e45a2ec16088e3ce009b64707d5b88
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:42:36 2011 +0200

    Run wrap-and-sort partially.

commit 6817be7dcafc0e9c265d907b608db05db8453870
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:37:47 2011 +0200

    Update debian/changelog.

commit e465b77a03c0e9da989675692ecbfa891da76a95
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:36:43 2011 +0200

    Update debian/watch file.

commit 0cee7f164bfc414a9b6bc01920a11461c10fb36f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:30:56 2011 +0200

    Refresh patches.

commit 96a56c9ad40ede3d15ae886da54bb794729b6146
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:25:52 2011 +0200

    Drop 0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch (included upstream).

commit cc3c0aaa1782d5e0d796483d921bdb8452310c54
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:25:04 2011 +0200

    Drop debian/source/include-binaries.

commit 6ef87a348279bd405df925c6704ce52bb7a618db
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:24:18 2011 +0200

    Follow PEP-8 in Apport hook.

commit bf307b0d98ba052f0cf4bb44de4da23c5608915b
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:22:29 2011 +0200

    Drop xulrunner from Apport hook.

commit 5b119db365bb13822ad61f162240c0b4ddaf5a52
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:12:40 2011 +0200

    Update debian/changelog.

commit 7a475a199aaa8681c9a0e67555fce5c58dd1fc76
Merge: 73c95c9 758b27a
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:11:09 2011 +0200

    Merge branch 'upstream'

commit 73c95c9039d0356cc3fca07a25b46b8061642906
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 14:01:54 2011 +0200

    Update debian/copyright.

commit 72f7805beff972788417ae170ba812877f60d051
Merge: 01a2940 47cbbaa
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Sep 20 13:34:00 2011 +0200

    Merge branch 'upstream'

-----------------------------------------------------------------------

Summary of changes:
 .project                                           |   11 -
 ChangeLog                                          |   17 +
 build.xml                                          |   20 +-
 debian/changelog                                   |    8 +-
 debian/copyright                                   |  526 +++++++++--------
 debian/eclipse-jdt.install                         |    2 +-
 debian/eclipse-platform-data.install               |    1 -
 debian/eclipse-platform.install                    |    2 +-
 debian/extra/copyright-gen.pl                      |    6 +-
 debian/extra/generate-copyright.sh                 |    9 +-
 debian/gbp.conf                                    |    2 +-
 ...ass-data-to-eclipse-and-VM-args-to-the-VM.patch |  104 ----
 debian/patches/compile-IPluginDescriptor.patch     |    4 +-
 debian/patches/eclipse-manpage.patch               |    4 +-
 debian/patches/osgi-services.patch                 |   28 +-
 debian/patches/remove-unnecessary-files.patch      |    2 +-
 debian/patches/series                              |    1 -
 debian/patches/strip-destDir.patch                 |    2 +-
 debian/patches/symlink-system-files.patch          |    4 +-
 debian/source/include-binaries                     |    1 -
 debian/source_eclipse.py                           |   37 +-
 debian/watch                                       |    2 +-
 eclipse-build-config/.project                      |   11 -
 eclipse-build-feature/.project                     |   11 -
 eclipse-build-generatedScripts.tar.bz2             |  Bin 22113 -> 22138 bytes
 .../org.apache.lucene/.settings/CVS/Entries        |    3 -
 .../org.apache.lucene/.settings/CVS/Repository     |    1 -
 .../plugins/org.apache.lucene/.settings/CVS/Root   |    1 -
 .../plugins/org.apache.lucene/.settings/CVS/Tag    |    1 -
 eclipse/plugins/org.apache.lucene/CVS/Entries      |   12 -
 eclipse/plugins/org.apache.lucene/CVS/Repository   |    1 -
 eclipse/plugins/org.apache.lucene/CVS/Root         |    1 -
 eclipse/plugins/org.apache.lucene/CVS/Tag          |    1 -
 .../plugins/org.apache.lucene/META-INF/CVS/Entries |    1 -
 .../org.apache.lucene/META-INF/CVS/Repository      |    1 -
 .../plugins/org.apache.lucene/META-INF/CVS/Root    |    1 -
 eclipse/plugins/org.apache.lucene/META-INF/CVS/Tag |    1 -
 .../org.apache.lucene/about_files/CVS/Entries      |    4 -
 .../org.apache.lucene/about_files/CVS/Repository   |    1 -
 .../plugins/org.apache.lucene/about_files/CVS/Root |    1 -
 .../plugins/org.apache.lucene/about_files/CVS/Tag  |    1 -
 .../org.apache.lucene/source-bundle/CVS/Entries    |    7 -
 .../org.apache.lucene/source-bundle/CVS/Repository |    1 -
 .../org.apache.lucene/source-bundle/CVS/Root       |    1 -
 .../org.apache.lucene/source-bundle/CVS/Tag        |    1 -
 .../source-bundle/META-INF/CVS/Entries             |    1 -
 .../source-bundle/META-INF/CVS/Repository          |    1 -
 .../source-bundle/META-INF/CVS/Root                |    1 -
 .../source-bundle/META-INF/CVS/Tag                 |    1 -
 .../source-bundle/about_files/CVS/Entries          |    4 -
 .../source-bundle/about_files/CVS/Repository       |    1 -
 .../source-bundle/about_files/CVS/Root             |    1 -
 .../source-bundle/about_files/CVS/Tag              |    1 -
 .../icons/obj/iu_patch_obj.gif                     |  Bin 609 -> 609 bytes
 .../icons/full/elcl16/var_cntnt_prvdr.gif          |  Bin 209 -> 209 bytes
 .../icons/full/etool16/new_sbook.gif               |  Bin 589 -> 589 bytes
 .../icons/full/ovr16/warning_ovr.gif               |  Bin 173 -> 173 bytes
 .../icons/wizban/defcon_wiz.png                    |  Bin 6820 -> 6820 bytes
 .../icons/obj16/frgmt_obj.gif                      |  Bin 313 -> 313 bytes
 .../icons/obj16/plugins_obj.gif                    |  Bin 214 -> 214 bytes
 .../icons/etool16/new_cheatsheet_wiz.gif           |  Bin 587 -> 587 bytes
 .../icons/obj16/cheatsheet_composite_obj.gif       |  Bin 366 -> 366 bytes
 .../icons/obj16/cheatsheet_conclusion_obj.gif      |  Bin 351 -> 351 bytes
 .../icons/obj16/cheatsheet_intro_obj.gif           |  Bin 354 -> 354 bytes
 .../icons/obj16/cheatsheet_item_obj.gif            |  Bin 337 -> 337 bytes
 .../icons/obj16/cheatsheet_obj.gif                 |  Bin 361 -> 361 bytes
 .../icons/obj16/cheatsheet_simple_obj.gif          |  Bin 218 -> 218 bytes
 .../icons/obj16/cheatsheet_subitem_obj.gif         |  Bin 581 -> 581 bytes
 .../icons/obj16/cheatsheet_taskgroup_obj.gif       |  Bin 363 -> 363 bytes
 .../icons/obj16/cheatsheet_unsupported_obj.gif     |  Bin 348 -> 348 bytes
 .../icons/obj16/toc_anchor_obj.gif                 |  Bin 197 -> 197 bytes
 .../icons/obj16/toc_leaftopic_obj.gif              |  Bin 354 -> 354 bytes
 .../icons/obj16/toc_link_obj.gif                   |  Bin 585 -> 585 bytes
 .../org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif  |  Bin 583 -> 583 bytes
 .../icons/obj16/toc_topic_obj.gif                  |  Bin 562 -> 562 bytes
 .../guide/images/readmeviewcommand.png             |  Bin 2956 -> 2956 bytes
 .../icons/full/elcl16/configs.gif                  |  Bin 368 -> 368 bytes
 .../icons/full/elcl16/usearch_obj.gif              |  Bin 586 -> 586 bytes
 .../plugins/org.apache.lucene/build.xml            |  197 -------
 .../plugins/org.eclipse.ant.core/build.xml         |  437 --------------
 .../plugins/org.eclipse.core.contenttype/build.xml |  334 -----------
 .../plugins/org.eclipse.core.expressions/build.xml |  354 ------------
 .../plugins/org.eclipse.core.jobs/build.xml        |  296 ----------
 .../plugins/org.eclipse.core.net/build.xml         |  330 -----------
 .../build.xml                                      |  295 ----------
 .../build.xml                                      |  376 ------------
 .../plugins/org.eclipse.core.runtime/build.xml     |  333 -----------
 .../plugins/org.eclipse.core.variables/build.xml   |  326 -----------
 .../plugins/org.eclipse.ecf.filetransfer/build.xml |  337 -----------
 .../plugins/org.eclipse.ecf.identity/build.xml     |  321 -----------
 .../build.xml                                      |  393 -------------
 .../build.xml                                      |  388 -------------
 .../build.xml                                      |  362 ------------
 .../build.xml                                      |  377 ------------
 .../plugins/org.eclipse.ecf.ssl/build.xml          |  314 ----------
 generatedScripts/plugins/org.eclipse.ecf/build.xml |  334 -----------
 .../plugins/org.eclipse.equinox.app/build.xml      |  327 -----------
 .../plugins/org.eclipse.equinox.common/build.xml   |  291 ----------
 .../org.eclipse.equinox.concurrent/build.xml       |  297 ----------
 .../build.xml                                      |  300 ----------
 .../org.eclipse.equinox.frameworkadmin/build.xml   |  295 ----------
 .../org.eclipse.equinox.http.jetty_2.0.0/build.xml |  320 -----------
 .../org.eclipse.equinox.http.servlet/build.xml     |  296 ----------
 .../plugins/org.eclipse.equinox.launcher/build.xml |  266 ---------
 .../build.xml                                      |  337 -----------
 .../org.eclipse.equinox.p2.console/build.xml       |  348 ------------
 .../plugins/org.eclipse.equinox.p2.core/build.xml  |  285 ----------
 .../org.eclipse.equinox.p2.director.app/build.xml  |  503 -----------------
 .../org.eclipse.equinox.p2.director/build.xml      |  345 -----------
 .../org.eclipse.equinox.p2.engine/build.xml        |  338 -----------
 .../build.xml                                      |  350 ------------
 .../org.eclipse.equinox.p2.jarprocessor/build.xml  |  387 -------------
 .../build.xml                                      |  442 ---------------
 .../org.eclipse.equinox.p2.metadata/build.xml      |  290 ----------
 .../build.xml                                      |  516 -----------------
 .../org.eclipse.equinox.p2.publisher/build.xml     |  353 ------------
 .../build.xml                                      |  527 -----------------
 .../org.eclipse.equinox.p2.repository/build.xml    |  327 -----------
 .../build.xml                                      |  390 -------------
 .../build.xml                                      |  339 -----------
 .../org.eclipse.equinox.p2.updatesite/build.xml    |  376 ------------
 .../org.eclipse.equinox.preferences/build.xml      |  314 ----------
 .../plugins/org.eclipse.equinox.registry/build.xml |  324 -----------
 .../plugins/org.eclipse.equinox.security/build.xml |  308 ----------
 .../build.xml                                      |  308 ----------
 .../build.xml                                      |  291 ----------
 .../plugins/org.eclipse.help.base/build.xml        |  552 ------------------
 .../plugins/org.eclipse.help/build.xml             |  360 ------------
 .../plugins/org.eclipse.osgi.services/build.xml    |  374 ------------
 .../plugins/org.eclipse.osgi/build.xml             |  370 ------------
 .../plugins/org.eclipse.pde.build/build.xml        |  597 --------------------
 .../org.eclipse.update.configurator/build.xml      |  306 ----------
 .../plugins/org.eclipse.update.core/build.xml      |  463 ---------------
 pdebuild.xml                                       |  229 +++++---
 pdebuild/eclipse-pdebuild.sh                       |   25 +-
 regenerateBootstrapFiles.sh                        |    6 +-
 .../eclipsebuild/SymlinkInstalledOSGiJars.java     |   20 +-
 .../linuxtools/eclipsebuild/SymlinkJars.java       |   49 ++
 .../eclipsebuild/SymlinkNonOSGiJars.java           |   22 +-
 .../linuxtools/eclipsebuild/SymlinkOSGiJars.java   |   24 +-
 140 files changed, 581 insertions(+), 20178 deletions(-)

diff --git a/.project b/.project
deleted file mode 100644
index 13c5398..0000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eclipse-build</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/ChangeLog b/ChangeLog
index 99301c1..c117f5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2011-08-18  Sami Wagiaalla  <swagiaal at redhat.com>
+
+	* pdebuild.xml: Created new target copyDeps.
+	Pass property copyfiles to Symlink tasks.
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkJars.java: New.
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java:
+	Extend SymlinkJars.
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java: Ditto.
+	* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java: Ditto.
+
+2011-08-09  Niels Thykier  <niels at thykier.net>
+
+	Bug #322271
+
+	* pdebuild/eclipse-pdebuild.sh: Pass JVM arguments directly to the VM and
+	pass -data to avoid using the user's real workspace.
+
 2011-08-05  Niels Thykier  <niels at thykier.net>
 
 	* build.xml: Re-enabled four patches for adding extra architectures to eclipse.
diff --git a/build.xml b/build.xml
index fe87f7c..57cf4d8 100644
--- a/build.xml
+++ b/build.xml
@@ -355,11 +355,11 @@
 	</target>
 
 	<target name="symlinkDeps" depends="applyPatches,defineTasks" unless="symlinks.complete">
-		<symlinkOSGiJars dependencies="${basedir}/dependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
-		<symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins" />
-		<symlinkOSGiJars dependencies="${basedir}/jdtdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
-		<symlinkNonOSGiJars dependencies="${basedir}/jdtnonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins" />
-		<symlinkOSGiJars dependencies="${basedir}/sdkdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" />
+		<symlinkOSGiJars dependencies="${basedir}/dependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" copyFiles="${copyFiles}"/>
+		<symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins"  copyFiles="${copyFiles}"/>
+		<symlinkOSGiJars dependencies="${basedir}/jdtdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" copyFiles="${copyFiles}"/>
+		<symlinkNonOSGiJars dependencies="${basedir}/jdtnonosgidependencies.properties" topLevelDir="${buildDirectory}/plugins" copyFiles="${copyFiles}"/>
+		<symlinkOSGiJars dependencies="${basedir}/sdkdependencies.properties" topLevelDir="${buildDirectory}/plugins" manifests="${basedir}/dependencyManifests" copyFiles="${copyFiles}"/>
 		<replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.8.2.v20110505-1300/META-INF/MANIFEST.MF" flags="m,g,s">
 			<regexp pattern="^Name.*" />
 			<substitution expression="" />
@@ -389,6 +389,12 @@
 		<echo file="symlinks-stamp" />
 	</target>
 
+	<target name="copyDeps">
+	  <antcall target="symlinkDeps">
+	    <param name="copyFiles" value="true"/>
+	  </antcall>
+	</target>
+
 	<target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
 		<echo message="build.xml:  eclipse.pdebuild.scripts = ${eclipse.pdebuild.scripts}" />
 		<java classname="org.eclipse.equinox.launcher.Main" fork="true" dir="${basedir}" failonerror="true">
@@ -975,12 +981,12 @@
 		<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
 		<!-- install Eclipse Java code formatter launcher -->
 		<property name="efj" value="${destDir}${prefix}/bin/efj"/>
-		<copy file="efj.sh" todir="${efj}" />
+		<copy file="efj.sh" tofile="${efj}" />
 	    <fileset id="equinoxLauncher" dir="${installationDir}/plugins">
 	      <include name="org.eclipse.equinox.launcher_*.jar" />
 	    </fileset>
 	    <property name="launcherJar" refid="equinoxLauncher"/>
-		<replace file="${efj}/efj.sh" token="@LAUNCHER@" value="${launcherJar}"/>
+		<replace file="${efj}" token="@LAUNCHER@" value="${prefix}/${libDir}/eclipse/plugins/${launcherJar}"/>
 		<!-- install icons -->
 		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse.png" tofile="${destDir}${prefix}/share/icons/hicolor/16x16/apps/eclipse.png" />
 		<copy file="${buildDirectory}/plugins/org.eclipse.platform/eclipse32.png" tofile="${destDir}${prefix}/share/icons/hicolor/32x32/apps/eclipse.png" />
diff --git a/debian/changelog b/debian/changelog
index 221c0a2..906326a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-eclipse (3.7~exp-6) UNRELEASED; urgency=low
+eclipse (3.7.0-1) UNRELEASED; urgency=low
 
+  * Upload to unstable.
   * Use pkg-config to determine CFLAGS and LIBS for gnomeproxy.
   * Eclipse 3.7 requires at least version 3.3 of asm3.
+  * Update debian/copyright.
+  * Drop xulrunner from Apport hook.
+  * Update debian/watch file.
 
- -- Benjamin Drung <bdrung at debian.org>  Mon, 19 Sep 2011 17:01:44 +0200
+ -- Benjamin Drung <bdrung at debian.org>  Tue, 20 Sep 2011 14:37:32 +0200
 
 eclipse (3.7~exp-5) experimental; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index e8f5490..78a549e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Eclipse
-Source: http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: Eclipse
+Source: http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
 Files: *
 Copyright: 2008-2009, Adobe Systems, Inc. and others
@@ -8,306 +8,332 @@ Copyright: 2008-2009, Adobe Systems, Inc. and others
            2009, Anyware Technologies and others
            2000-2005, Apache Software Foundation
            1983-2002, Apple Computer, Inc
-           2009, Avaloq Evolution AG and others
+           2009-2010, Avaloq Evolution AG and others
            2003-2006, BBDO Detroit and others
            2005-2009, BEA Systems Inc. and others
-           2005-2009, BEA Systems, Inc
-           2005-2009, BEA Systems, Inc. and others
-           2008-2009, Band XI International, LLC and others
+           2005-2011, BEA Systems, Inc
+           2005-2011, BEA Systems, Inc. and others
+           2008-2010, Band XI International, LLC and others
            2007, Benjamin Muskalla and others
            2007-2008, Brad Reynolds and others
            2008, Bredex GmbH and others
+           2010-2011, Broadcom Corporation and others
            2006-2009, Cerner Corporation and others
-           2006-2010, Cloudsmith Inc
-           2009, Cloudsmith Inc and others
-           2009, Cloudsmith Inc, and other
-           2009-2010, Cloudsmith Inc. and others
-           2009, Cloudsmith and others
-           2008-2010, Code 9 Corporation and others
-           2008-2010, Code 9 and others
-           2006, Cognos Incorporated
+           2006-2011, Cloudsmith Inc
+           2009-2010, Cloudsmith Inc and others
+           2009-2011, Cloudsmith Inc, and other
+           2009-2011, Cloudsmith Inc. and others
+           2009-2010, Cloudsmith and others
+           2008-2011, Code 9 Corporation and others
+           2008-2011, Code 9 and others
+           2006-2008, Cognos Incorporated
            2006-2008, Cognos Incorporated, IBM Corporation
            2004-2010, Composent, Inc
            2004-2010, Composent, Inc. and others
            2004-2010, Composent, Inc., IBM
            2004, Composent, Inc., Peter Nehrer, Boris Bokowski
            2008, Cypal Solutions
-           2009, Daniel Le Berre and others
+           2009-2010, Daniel Le Berre and others
            2004-2010, Eclipse Foundation and others
-           2008-2010, EclipseSource Corporation and others
-           2008-2010, EclipseSource and others
+           2008-2011, EclipseSource Corporation and others
+           2010-2011, EclipseSource Inc. and others
+           2008-2011, EclipseSource and others
            2009, EclipseSource, Inc
            2007-2008, Ecliptical Software Inc. and others
            2009-2010, Eric Rizzo and others
-           2008-2010, Freescale Semiconductor and others
-           2002-2008, GEBIT Gesellschaft fuer EDV-Beratung
-           2008-2009, Genuitec, LLC and others
-           2005-2008, Gunnar Wagenknecht and others
-           2008-2009, Heiko Seeberger and others
-           1999-2010, IBM Corporation
+           2011, Fair Isaac Corporation and others
+           2008-2011, Freescale Semiconductor and others
+           2002-2011, GEBIT Gesellschaft fuer EDV-Beratung
+           2008-2010, Genuitec, LLC and others
+           2005-2011, Gunnar Wagenknecht and others
+           2008-2010, Heiko Seeberger and others
+           1999-2011, IBM Corporation
            2000-2007, IBM Corporation, BEA Systems, Inc., and others
            2000-2010, IBM and others.
            2007, IBM, Composent Inc. and others
            2006, IBM, Inc and Composent, Inc
-           2005-2010, Intel Corporation and others
+           2005-2011, Intel Corporation and others
            2007, JCraft,Inc. and others
            2008, Jay Rosenthal
            2008, Jay Rosenthal and others
-           2000-2006, John-Mason P. Shackelford and others
-           2000-2007, Keith Seitz and others
-           2005-2006, Maik Schreiber
+           2010, Jesper Steen Moller and others
+           2000-2011, John-Mason P. Shackelford and others
+           2000-2010, Keith Seitz and others
            2008, Marko Topolnik and others
            2008-2009, Martin Lippert and others
-           2008-2010, Mateusz Matela and others
+           2008-2011, Mateusz Matela and others
            2005-2009, Matt Carter and others
-           2000-2005, Matt Conway and others
+           2000-2006, Matt Conway and others
            2007-2009, Matthew Conway and others
            2007-2010, Matthew Hall and others
            2008, Micah Hainline and others
-           2008-2010, Oakland Software Incorporated and others
+           2008-2011, Oakland Software Incorporated and others
            2009, Oakland Software and others
-           2002-2006, Object Factory Inc
+           2002-2011, Object Factory Inc
            2009-2010, Ovidio Mallo and others
            2008-2009, Peter Centgraf and others
-           1997-2010, ProSyst Software GmbH
+           1997-2011, ProSyst Software GmbH
+           1997-2011, ProSyst Software GmbH and others
            2004-2008, QNX Software Systems and others
            2010, Red Hat Inc. and others
-           2004-2010, Red Hat Incorporated and others
+           2004-2011, Red Hat Incorporated and others
            2010, Red Hat and others
            2005-2007, Remy Suen
-           2004-2009, Richard Hoefter and others
+           2004-2011, Richard Hoefter and others
+           20011, SAP AG
+           2011, SAP AG and others
+           2010-2011, Sonatype, Inc
            2010, Sonatype, Inc and others
+           2011, Sonatype, Inc. and others
            2009, SpringSource and others
-           2009, Task top Technologies and others
-           2004-2010, Tasktop Technologies and others
-           2009-2010, Texas Instruments and others
+           2009-2010, Task top Technologies and others
+           2004-2011, Tasktop Technologies and others
+           2009-2011, Texas Instruments and others
            2009, ThoughtWorks, Inc. and others
-           2006-2009, Tom Schindl and others
+           2006-2010, Tom Schindl and others
+           2008-2011, VMware Inc
            2008, Versant Corporation
            2008-2010, Versant Corporation. and others
            2009, Vladimir Piskarev and others
-           2006-2010, Wind River Systems and others
+           1998-2002, W3C (MIT, INRIA, Keio)
+           2006-2011, Wind River Systems and others
            2007-2010, Wind River Systems, Inc. and others
-           2007-2008, aQute and others
-           2007-2009, compeople AG and others
+           2011, WindRiver Corporation and others
+           1998-2007, World Wide Web Consortium
+           2007-2010, aQute and others
+           2009-2010, compeople AG (http://www.compeople.de) / 2008 Nokia Corporation and/or its subsidiary(-ies)
+           2007-2011, compeople AG and others
            2005-2008, db4objects Inc. (http://www.db4o.com) and others
            2005-2009, db4objects Inc. http://www.db4o.com
            2005-2007, db4objects Inc. http://www.db4o.com and others
            2009, eXXcellent solutions gmbh and others
-           2009, eXXcellent solutions gmbh, EclipseSource Corporation
+           2009-2011, eXXcellent solutions gmbh, EclipseSource Corporation
 License: EPL-1.0
 
-Files: "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_custom.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_custom.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_stats.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/atk_structs.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_stats.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.c",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_structs.h",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Platform.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/accessibility/gtk/*",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkColor.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEvent.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkGeometry.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkRectangle.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkVisual.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAdjustment.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkCombo.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFileSelection.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttrColor.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttrInt.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoLogAttr.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/PangoRectangle.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/motif_gtk/library/*",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/library/*",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/gnome/org/eclipse/swt/internal/gnome/*",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/*",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/internal/webkit/*"
-Copyright: 2000-2010, IBM Corporation and others
+Files: eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk_custom.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk_custom.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk_stats.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk_stats.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk_structs.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/atk_structs.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os_custom.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os_custom.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os_stats.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os_stats.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os_structs.c
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/library/os_structs.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/Platform.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/accessibility/gtk/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GInterfaceInfo.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GObjectClass.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GTypeInfo.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GTypeQuery.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkColor.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkDragContext.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEvent.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventAny.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventButton.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventCrossing.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventExpose.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventFocus.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventKey.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventMotion.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventProperty.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventScroll.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventVisibility.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkEventWindowState.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkGCValues.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkGeometry.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkImage.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkRectangle.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkVisual.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GdkWindowAttr.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkAdjustment.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkAllocation.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkBorder.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkCellRendererClass.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkColorSelectionDialog.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkCombo.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkFileSelection.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkFixed.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkRequisition.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkSelectionData.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetEntry.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkTargetPair.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/GtkWidgetClass.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoAttrColor.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoAttrInt.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoAttribute.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoItem.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutLine.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoLayoutRun.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoLogAttr.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/gtk/org/eclipse/swt/internal/gtk/PangoRectangle.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/motif_gtk/library/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Program/gnome/library/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Program/gnome/org/eclipse/swt/internal/gnome/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/gtk/library/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/gtk/org/eclipse/swt/internal/webkit/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/win32/library/webkit_win32.cpp
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/win32/library/webkit_win32_stats.cpp
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/win32/library/webkit_win32_stats.h
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/win32/library/webkit_win32_structs.cpp
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?WebKit/win32/library/webkit_win32_structs.h
+Copyright: 2000-2011, IBM Corporation and others
 License: LGPL-2.1
 
-Files: eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/bin/*,
-       eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/*,
-       eclipse/plugins/org.eclipse.equinox.ds/src/org/apache/*,
-       eclipse/plugins/org.eclipse.equinox.preferences/src/org/osgi/service/prefs/*,
-       eclipse/plugins/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReferenceMap.java,
-       eclipse/plugins/org.eclipse.help.base/src_demo/org/apache/lucene/demo/html/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/cm/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/component/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/device/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/event/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/http/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/io/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/log/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/metatype/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/provisioning/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/upnp/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/useradmin/*,
-       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/*,
-       eclipse/plugins/org.eclipse.osgi.util/src/org/osgi/util/measurement/*,
-       eclipse/plugins/org.eclipse.osgi.util/src/org/osgi/util/position/*,
-       eclipse/plugins/org.eclipse.osgi.util/src/org/osgi/util/xml/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/framework/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/url/*,
-       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/*,
+Files: eclipse/plugins/org.apache.ant_1.7.1.v20090120-1145/bin/*
+       eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/*
+       eclipse/plugins/org.eclipse.equinox.coordinator/src/org/osgi/service/coordinator/*
+       eclipse/plugins/org.eclipse.equinox.ds/src/org/apache/*
+       eclipse/plugins/org.eclipse.equinox.preferences/src/org/osgi/service/prefs/*
+       eclipse/plugins/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/ReferenceMap.java
+       eclipse/plugins/org.eclipse.help.base/src_demo/org/apache/lucene/demo/html/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/cm/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/component/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/device/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/event/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/http/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/io/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/log/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/metatype/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/provisioning/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/upnp/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/useradmin/*
+       eclipse/plugins/org.eclipse.osgi.services/src/org/osgi/service/wireadmin/*
+       eclipse/plugins/org.eclipse.osgi.util/src/org/osgi/util/measurement/*
+       eclipse/plugins/org.eclipse.osgi.util/src/org/osgi/util/position/*
+       eclipse/plugins/org.eclipse.osgi.util/src/org/osgi/util/xml/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/bundle/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/resolver/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/service/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/hooks/weaving/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/launch/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/startlevel/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/framework/wiring/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/condpermadmin/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/framework/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/log/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/packageadmin/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/permissionadmin/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/startlevel/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/service/url/*
+       eclipse/plugins/org.eclipse.osgi/osgi/src/org/osgi/util/tracker/*
        eclipse/plugins/org.eclipse.pde.build/src_ant/org/eclipse/pde/internal/build/tasks/Version.java
-Copyright: 2004-2005, IBM Corporation
+Copyright: 2004-2010, IBM Corporation
            2001-2004, Apache Software Foundation
-           2000-2009, OSGi Alliance
+           2000-2011, OSGi Alliance
 License: Apache-2.0
 
-Files: "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/init/XPCOMInit.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/*",
-       "eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/org/eclipse/swt/internal/cairo/*"
-Copyright: 2003-2009, IBM Corporation
+Files: eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/init/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsDynamicFunctionLoad.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsEmbedString.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAuthInformation.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBadCertListener2.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICancelable.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICategoryManager.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertOverrideService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICertificateDialogs.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIClassInfo.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentRegistrar.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIContextMenuListener.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookie.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieManager.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsICookieService_1_9.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsID.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMSerializer_1_7.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindowCollection.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDataType.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDirectoryServiceProvider2.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDownload_1_8.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFactory.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncherDialog_1_9.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_9.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIIOService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInterfaceRequestor.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIJSContextStack.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMIMEInputStream.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIMemory.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIObserverService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProgressDialog_1_8.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPromptService2.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIProperties.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIRequest.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager_1_9_1.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsISerializable.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIServiceManager.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsISimpleEnumerator.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupportsWeakReference.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsITooltipListener.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsITransfer.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURIContentListener.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWeakReference.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChromeFocus.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserFocus.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserSetup.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserStream.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigation.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebNavigationInfo.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgress.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener2.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowCreator2.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWindowWatcher.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWritableVariant.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509Cert.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIX509CertValidity.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCSecurityManager.java
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/cairo/library/*
+       eclipse/plugins/org.eclipse.swt/Eclipse?SWT?PI/cairo/org/eclipse/swt/internal/cairo/*
+Copyright: 2003-2011, IBM Corporation
 License: MPL-1.1
 
 Files: eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/MarkerSortUtil.java
@@ -358,7 +384,7 @@ License: other
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2010, Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>
+Copyright: 2010-2011, Debian Orbital Alignment Team <pkg-java-maintainers at lists.alioth.debian.org>
 License: EPL-1.0
 
 License: LGPL-2.1
@@ -590,7 +616,7 @@ License: EPL-1.0
  a jury trial in any resulting litigation.
 
 
-License: MPL-v1.1
+License: MPL-1.1
                            MOZILLA PUBLIC LICENSE
                                  Version 1.1
  .
diff --git a/debian/eclipse-jdt.install b/debian/eclipse-jdt.install
index b22eb00..d07ae31 100644
--- a/debian/eclipse-jdt.install
+++ b/debian/eclipse-jdt.install
@@ -1,7 +1,7 @@
 usr/*/eclipse/dropins/jdt/features/org.eclipse.jdt_*
 usr/lib/eclipse/dropins/jdt/plugins/junit4.jar
-usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.ui_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.launching_*.jar
+usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.ant.ui_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.core_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.pluggable.core_*.jar
 usr/lib/eclipse/dropins/jdt/plugins/org.eclipse.jdt.apt.ui_*.jar
diff --git a/debian/eclipse-platform-data.install b/debian/eclipse-platform-data.install
index 76f191f..58bdfa2 100644
--- a/debian/eclipse-platform-data.install
+++ b/debian/eclipse-platform-data.install
@@ -91,7 +91,6 @@ usr/lib/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.scheduler_*.jar
 usr/lib/eclipse/plugins/org.eclipse.update.ui_*.jar
-
 usr/share/eclipse/features/org.eclipse.cvs_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.core.feature_*
 usr/share/eclipse/features/org.eclipse.equinox.p2.extras.feature_*
diff --git a/debian/eclipse-platform.install b/debian/eclipse-platform.install
index 6f19b3a..964e3b3 100644
--- a/debian/eclipse-platform.install
+++ b/debian/eclipse-platform.install
@@ -24,9 +24,9 @@ usr/lib/eclipse/plugins/org.apache.commons.el_*.jar
 usr/lib/eclipse/plugins/org.apache.commons.httpclient_*.jar
 usr/lib/eclipse/plugins/org.apache.commons.logging_*.jar
 usr/lib/eclipse/plugins/org.apache.jasper_*.jar
-usr/lib/eclipse/plugins/org.apache.lucene_*.jar
 usr/lib/eclipse/plugins/org.apache.lucene.analysis_*.jar
 usr/lib/eclipse/plugins/org.apache.lucene.core_*.jar
+usr/lib/eclipse/plugins/org.apache.lucene_*.jar
 usr/lib/eclipse/plugins/org.eclipse.ant.core_*.jar
 usr/lib/eclipse/plugins/org.eclipse.core.filesystem.linux.*
 usr/lib/eclipse/plugins/org.eclipse.core.resources_*.jar
diff --git a/debian/extra/copyright-gen.pl b/debian/extra/copyright-gen.pl
index 6b99e0f..1760238 100755
--- a/debian/extra/copyright-gen.pl
+++ b/debian/extra/copyright-gen.pl
@@ -162,7 +162,7 @@ while ( my ($license, $holderMap) = each(%$lic)){
 	push(@$cr, $crdata);
 	generateFileList($files, $flist);
     }
-    print "Files: ". join(",\n       ", unique(sort(@$files))) . "\n";
+    print "Files: ". join("\n       ", unique(sort(@$files))) . "\n";
     print "Copyright: " .  join("\n           ", @$cr) . "\nLicense: $li\n\n";
 }
 
@@ -217,7 +217,7 @@ License: other
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2010, Debian Orbital Alignment Team <pkg-java-maintainers${at}lists.alioth.debian.org>
+Copyright: 2010-2011, Debian Orbital Alignment Team <pkg-java-maintainers${at}lists.alioth.debian.org>
 License: EPL-1.0
 
 EOF
@@ -271,7 +271,7 @@ sub generateFileList {
 	    $dirdata->[0] = 0;
 	}
 	if($file =~ m/[ \t]/o){
-	    $file = "\"$file\"";
+	    $file =~ s/ /?/g;
 	}
 	push(@$allFiles, $file);
     }
diff --git a/debian/extra/generate-copyright.sh b/debian/extra/generate-copyright.sh
index 90ffd4b..50b6133 100755
--- a/debian/extra/generate-copyright.sh
+++ b/debian/extra/generate-copyright.sh
@@ -5,9 +5,9 @@ set -e
 dh_testdir
 
 cat <<EOF > debian/copyright
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Eclipse
-Source: http://www.eclipse.org/downloads/download.php?file=/technology/linuxtools/eclipse-build
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Upstream-Name: Eclipse
+Source: http://download.eclipse.org/technology/linuxtools/eclipse-build/
 
 EOF
 
@@ -243,7 +243,7 @@ License: EPL-1.0
  a jury trial in any resulting litigation.
 
 
-License: MPL-v1.1
+License: MPL-1.1
                            MOZILLA PUBLIC LICENSE
                                  Version 1.1
  .
@@ -713,5 +713,4 @@ License: MPL-v1.1
       the notices in the Source Code files of the Original Code. You should
       use the text of this Exhibit A rather than the text found in the
       Original Code Source Code for Your Modifications.]
- 
 EOF
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 587f768..fa22434 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-compression = bzip2
+compression = xz
 upstream-branch = upstream
 debian-branch = master
 
diff --git a/debian/patches/0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch b/debian/patches/0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
deleted file mode 100644
index c7e6b2e..0000000
--- a/debian/patches/0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 06176095e850e1c86b2617d7325a028875a817f8 Mon Sep 17 00:00:00 2001
-From: Niels Thykier <niels at thykier.net>
-Date: Tue, 9 Aug 2011 12:51:24 +0200
-Subject: [PATCH] pdebuild: Pass -data to eclipse and VM args to the VM
-
-2011-08-09  Niels Thykier  <niels at thykier.net>
-
-	Bug #322271
-
-	* pdebuild/eclipse-pdebuild.sh: Pass JVM arguments directly to the VM and
-	pass -data to avoid using the user's real workspace.
----
- eclipse-build/ChangeLog                    |    7 +++++++
- eclipse-build/pdebuild/eclipse-pdebuild.sh |   25 +++++++++++++++----------
- 2 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/eclipse-build/ChangeLog b/eclipse-build/ChangeLog
-index 99301c1..f0427a8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,10 @@
-+2011-08-09  Niels Thykier  <niels at thykier.net>
-+
-+	Bug #322271
-+
-+	* pdebuild/eclipse-pdebuild.sh: Pass JVM arguments directly to the VM and
-+	pass -data to avoid using the user's real workspace.
-+
- 2011-08-05  Niels Thykier  <niels at thykier.net>
- 
- 	* build.xml: Re-enabled four patches for adding extra architectures to eclipse.
-diff --git a/eclipse-build/pdebuild/eclipse-pdebuild.sh b/eclipse-build/pdebuild/eclipse-pdebuild.sh
-index 209f03e..ea14c58 100755
---- a/pdebuild/eclipse-pdebuild.sh
-+++ b/pdebuild/eclipse-pdebuild.sh
-@@ -123,6 +123,7 @@ sourceDir=$PWD
- buildDir=$PWD/build
- SDK=$buildDir/SDK
- homeDir=$buildDir/home
-+workspaceDir=$homeDir/workspace
- datadir=`rpm --eval "%{_libdir}"`
- pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
- 
-@@ -195,6 +196,11 @@ if [ $dryRun -ne 1 ]; then
-     mkdir -p $homeDir
- fi
- 
-+echo "mkdir -p $workspaceDir"
-+if [ $dryRun -ne 1 ]; then
-+    mkdir -p $workspaceDir
-+fi
-+
- if [ -z $featureId ]; then
-     findFeatureId
- fi
-@@ -267,7 +273,10 @@ launcherJar=$(ls $SDK/plugins | grep "org.eclipse.equinox.launcher_")
- 
- if [ $testing != true ]; then
-   java -cp $SDK/plugins/${launcherJar} \
-+    -Duser.home=$homeDir \
-+    $vmArgs \
-     org.eclipse.core.launcher.Main \
-+    -data $workspaceDir \
-     -application org.eclipse.ant.core.antRunner \
-     $debugPlatformArgs \
-     -Dtype=feature \
-@@ -279,15 +288,14 @@ if [ $testing != true ]; then
-     $orbitDeps \
-     -Dtesting="$testing" \
-     $additionalArgs \
--    -f $pdeBuildDir/scripts/build.xml \
--    -vmargs \
--    -Duser.home=$homeDir \
--    $vmArgs
--
-+    -f $pdeBuildDir/scripts/build.xml
- else
-   echo "\
-   java -cp $SDK/plugins/${launcherJar} \
-+    -Duser.home=$homeDir \
-+    $vmArgs \
-     org.eclipse.core.launcher.Main \
-+    -data $workspaceDir \
-     -application org.eclipse.ant.core.antRunner \
-     $debugPlatformArgs \
-     -Dtype=feature \
-@@ -297,12 +305,9 @@ else
-     -DbuildDirectory=$buildDir \
-     -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
-     $orbitDeps \
--    -Dtesting="$testing" \
-+    -Dtesting=\"$testing\" \
-     $additionalArgs \
--    -f $pdeBuildDir/scripts/build.xml \
--    -vmargs \
--    -Duser.home=$homeDir \
--    $vmArgs
-+    -f $pdeBuildDir/scripts/build.xml
-   "
- fi
- 
--- 
-1.7.5.4
-
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index c548112..1f61a85 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,8 +4,8 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
 
 --- a/build.xml
 +++ b/build.xml
-@@ -389,7 +389,38 @@
- 		<echo file="symlinks-stamp" />
+@@ -395,7 +395,38 @@
+ 	  </antcall>
  	</target>
  
 -	<target name="build" depends="applyPatches,symlinkDeps,bootstrap,compilelibs" unless="build.complete">
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index da77a46..04835dc 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -622,11 +622,9 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
 +
 +</refsect1>
 +</refentry>
-diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
-index fe87f7c..d92f321 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -992,6 +992,11 @@
+@@ -998,6 +998,11 @@
  		<!-- eclipse binary -->
  		<mkdir dir="${destDir}${prefix}/bin" />
  		<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" overwrite="true"/>
diff --git a/debian/patches/osgi-services.patch b/debian/patches/osgi-services.patch
index a378a9d..f968fc0 100644
--- a/debian/patches/osgi-services.patch
+++ b/debian/patches/osgi-services.patch
@@ -7,21 +7,21 @@ Applied-Upstream: no
 --- a/pdebuild.xml
 +++ b/pdebuild.xml
 @@ -30,6 +30,7 @@
- 		<file name="org.eclipse.equinox.preferences" />
- 		<file name="org.eclipse.core.runtime.compatibility.auth" />
- 		<file name="org.eclipse.core.contenttype" />
-+		<file name="org.eclipse.osgi.services" />
- 		<file name="org.eclipse.equinox.app" />
- 		<file name="org.eclipse.core.runtime" />
- 		<file name="org.eclipse.core.variables" />
+ 		       org.eclipse.equinox.preferences
+ 		       org.eclipse.core.runtime.compatibility.auth
+ 		       org.eclipse.core.contenttype
++		       org.eclipse.osgi.services
+ 		       org.eclipse.equinox.app
+ 		       org.eclipse.core.runtime
+ 		       org.eclipse.core.variables
 @@ -65,7 +66,6 @@
- 		<file name="org.eclipse.equinox.p2.updatesite" />
- 		<file name="org.eclipse.pde.build" />
- 		<file name="org.eclipse.equinox.launcher" />
--		<file name="org.eclipse.osgi.services" />
- 		<file name="org.eclipse.equinox.p2.console" />
- 		<file name="org.eclipse.equinox.p2.director.app" />
- 		<file name="org.eclipse.update.core" />
+ 		       org.eclipse.equinox.p2.updatesite
+ 		       org.eclipse.pde.build
+ 		       org.eclipse.equinox.launcher
+-		       org.eclipse.osgi.services
+ 		       org.eclipse.equinox.p2.console
+ 		       org.eclipse.equinox.p2.director.app
+ 		       org.eclipse.update.core
 --- /dev/null
 +++ b/patches/osgi-services-build.patch
 @@ -0,0 +1,23 @@
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index fa6967c..0c5e9a1 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,7 +3,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1143,6 +1143,10 @@
+@@ -1149,6 +1149,10 @@
  			</fileset>
  		</apply>
  		
diff --git a/debian/patches/series b/debian/patches/series
index f1daa96..9016c03 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,7 +5,6 @@ add-o.e.equinox.concurrent.patch
 ecj-gccmain-java.patch
 fix-help-contents.patch
 pdebuild-path-copy-platform.patch
-0001-pdebuild-Pass-data-to-eclipse-and-VM-args-to-the-VM.patch
 pdebuild-script.patch
 symlink-system-files.patch
 remove-unnecessary-files.patch
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index 4df6fe1..1621752 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
 
 --- a/build.xml
 +++ b/build.xml
-@@ -1147,6 +1147,21 @@
+@@ -1153,6 +1153,21 @@
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
  		<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
diff --git a/debian/patches/symlink-system-files.patch b/debian/patches/symlink-system-files.patch
index fa16697..b14d4f0 100644
--- a/debian/patches/symlink-system-files.patch
+++ b/debian/patches/symlink-system-files.patch
@@ -1,8 +1,6 @@
 Description: Symlink system ant files
 From: Benjamin Drung <bdrung at ubuntu.com>
 
-diff --git a/eclipse-build/nonosgidependencies.properties b/eclipse-build/nonosgidependencies.properties
-index b91141d..a47fc48 100644
 --- a/nonosgidependencies.properties
 +++ b/nonosgidependencies.properties
 @@ -1,3 +1,8 @@
@@ -14,7 +12,7 @@ index b91141d..a47fc48 100644
  org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar=/usr/share/java/ant/ant-antlr.jar:/usr/share/java/ant-antlr.jar
  org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar=/usr/share/java/ant/ant-apache-bcel.jar:/usr/share/java/ant-apache-bcel.jar
  org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar=/usr/share/java/ant/ant-apache-bsf.jar:/usr/share/java/ant-apache-bsf.jar
-@@ -18,5 +23,5 @@ org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar=/usr/share/java/ant/ant-j
+@@ -18,5 +23,5 @@
  org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar=/usr/share/java/ant-launcher.jar:/usr/share/java/ant-launcher.jar
  #org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar=/usr/share/java/ant-netrexx.jar:/usr/share/java/ant-netrexx.jar
  org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar=/usr/share/java/ant/ant-swing.jar:/usr/share/java/ant-swing.jar
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644
index 6701e6c..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1 +0,0 @@
-debian/eclipse-build-generatedScripts.tar.bz2
diff --git a/debian/source_eclipse.py b/debian/source_eclipse.py
index 6fecac5..24d3c58 100644
--- a/debian/source_eclipse.py
+++ b/debian/source_eclipse.py
@@ -9,26 +9,23 @@ import glob
 import os
 
 def add_info(report):
-	apport.hookutils.attach_conffiles(report, "eclipse-platform")
+    apport.hookutils.attach_conffiles(report, "eclipse-platform")
 
-	# Guess workspace if we fail to detect it
-	workspace = "~/workspace"
+    # Guess workspace if we fail to detect it
+    workspace = "~/workspace"
 
-	# try to detect the workspace directory
-	preffile_pattern = "~/.eclipse/org.eclipse.platform_*/configuration/.settings/org.eclipse.ui.ide.prefs"
-	for preffile in glob.glob(os.path.expanduser(preffile_pattern)):
-		lines = open(preffile).readlines()
-		lines = filter(lambda l: l.startswith("RECENT_WORKSPACES="), lines)
-		if len(lines) > 0:
-			workspaces = lines[0].split("=")[1]
-			# workspaces are separated by "\n" - we take the first item
-			workspace = workspaces.split("\\n")[0]
+    # try to detect the workspace directory
+    preffile_pattern = "~/.eclipse/org.eclipse.platform_*/configuration/" + \
+                       ".settings/org.eclipse.ui.ide.prefs"
+    for preffile in glob.glob(os.path.expanduser(preffile_pattern)):
+        lines = open(preffile).readlines()
+        lines = filter(lambda l: l.startswith("RECENT_WORKSPACES="), lines)
+        if len(lines) > 0:
+            workspaces = lines[0].split("=")[1]
+            # workspaces are separated by "\n" - we take the first item
+            workspace = workspaces.split("\\n")[0]
 
-	# workspace/.metadata/.log
-	logfile = os.path.join(workspace, ".metadata", ".log")
-	apport.hookutils.attach_file_if_exists(report, logfile, "workspace.metadata.log")
-
-	# list of xulrunner libraries
-	xulrunner_list = glob.glob("/usr/lib/xulrunner-[0-9]*")
-	xulrunner_list.sort()
-	report["xulrunner-versions"] = "\n".join(xulrunner_list)
+    # workspace/.metadata/.log
+    logfile = os.path.join(workspace, ".metadata", ".log")
+    apport.hookutils.attach_file_if_exists(report, logfile,
+                                           "workspace.metadata.log")
diff --git a/debian/watch b/debian/watch
index 82b1a41..c360367 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 # http://download.eclipse.org/technology/linuxtools/eclipse-build/
-ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/linuxtools/eclipse-build/3.6.x_Helios/eclipse-([\d\.]*)-src\.tar\.bz2
+ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/linuxtools/eclipse-build/3.7.x_Indigo/eclipse-([\d\.]*)-src\.tar\.bz2
diff --git a/eclipse-build-config/.project b/eclipse-build-config/.project
deleted file mode 100644
index caa03f5..0000000
--- a/eclipse-build-config/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eclipse-build-config</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/eclipse-build-feature/.project b/eclipse-build-feature/.project
deleted file mode 100644
index d9e97c4..0000000
--- a/eclipse-build-feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eclipse-build-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/eclipse-build-generatedScripts.tar.bz2 b/eclipse-build-generatedScripts.tar.bz2
index 22c14c7..47b1a65 100644
Binary files a/eclipse-build-generatedScripts.tar.bz2 and b/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.compendium.sdk/feature.properties
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.core.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.core.sdk/feature.properties
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/carbon/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/make_carbon.mak b/eclipse/features/org.eclipse.equinox.executable/library/carbon/make_carbon.mak
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/carbon/make_cocoa.mak b/eclipse/features/org.eclipse.equinox.executable/library/carbon/make_cocoa.mak
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/motif/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/motif/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/photon/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/photon/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.executable/library/win32/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/win32/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.properties b/eclipse/features/org.eclipse.equinox.p2.discovery.feature/feature.properties
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.p2.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.p2.sdk/feature.properties
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.sdk/.project b/eclipse/features/org.eclipse.equinox.sdk/.project
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.sdk/build.properties b/eclipse/features/org.eclipse.equinox.sdk/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.sdk/feature.xml b/eclipse/features/org.eclipse.equinox.sdk/feature.xml
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.serverside.sdk/feature.properties
old mode 100755
new mode 100644
diff --git a/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.properties b/eclipse/features/org.eclipse.equinox.weaving.sdk/feature.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/.classpath b/eclipse/plugins/org.apache.lucene/.classpath
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/.cvsignore b/eclipse/plugins/org.apache.lucene/.cvsignore
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/.project b/eclipse/plugins/org.apache.lucene/.project
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/.settings/CVS/Entries b/eclipse/plugins/org.apache.lucene/.settings/CVS/Entries
deleted file mode 100644
index d984568..0000000
--- a/eclipse/plugins/org.apache.lucene/.settings/CVS/Entries
+++ /dev/null
@@ -1,3 +0,0 @@
-/org.eclipse.core.resources.prefs/1.1.2.1/Tue Apr 20 19:57:44 2010/-ko/Tv2_9_1
-/org.eclipse.pde.core.prefs/1.1.2.1/Sun Oct 15 13:01:56 2006/-ko/Tv2_9_1
-/org.eclipse.pde.prefs/1.1.2.1/Wed Jan  7 08:16:14 2009/-ko/Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/.settings/CVS/Repository b/eclipse/plugins/org.apache.lucene/.settings/CVS/Repository
deleted file mode 100644
index 6083047..0000000
--- a/eclipse/plugins/org.apache.lucene/.settings/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene/.settings
diff --git a/eclipse/plugins/org.apache.lucene/.settings/CVS/Root b/eclipse/plugins/org.apache.lucene/.settings/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/.settings/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/.settings/CVS/Tag b/eclipse/plugins/org.apache.lucene/.settings/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/.settings/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.core.prefs b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.prefs b/eclipse/plugins/org.apache.lucene/.settings/org.eclipse.pde.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Entries b/eclipse/plugins/org.apache.lucene/CVS/Entries
deleted file mode 100644
index dc1d4c8..0000000
--- a/eclipse/plugins/org.apache.lucene/CVS/Entries
+++ /dev/null
@@ -1,12 +0,0 @@
-/.classpath/1.1.4.2.4.2/Wed Jan  7 08:16:14 2009/-ko/Tv2_9_1
-/.cvsignore/1.1.4.1/Sun Oct 15 13:01:56 2006/-ko/Tv2_9_1
-/.project/1.1.4.1/Tue May 10 11:31:21 2011/-ko/Tv2_9_1
-D/.settings////
-D/META-INF////
-/about.html/1.1.4.2.4.1.2.2/Fri Jan 21 17:20:15 2011/-ko/Tv2_9_1
-D/about_files////
-/build.properties/1.1.4.5.4.1/Wed Jan  7 08:16:14 2009/-ko/Tv2_9_1
-D/org////
-/plugin.properties/1.1.4.1/Sun Oct 15 13:01:55 2006/-ko/Tv2_9_1
-/readme-bundles.txt/1.1.2.1/Wed Jan  7 08:16:14 2009/-ko/Tv2_9_1
-D/source-bundle////
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Repository b/eclipse/plugins/org.apache.lucene/CVS/Repository
deleted file mode 100644
index 50dfa9d..0000000
--- a/eclipse/plugins/org.apache.lucene/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Root b/eclipse/plugins/org.apache.lucene/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Tag b/eclipse/plugins/org.apache.lucene/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/CVS/Template b/eclipse/plugins/org.apache.lucene/CVS/Template
deleted file mode 100644
index e69de29..0000000
diff --git a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Entries b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Entries
deleted file mode 100644
index 2a9629d..0000000
--- a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Entries
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF/1.1.4.3.4.2.2.1/Tue Apr 20 19:57:44 2010/-ko/Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Repository b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Repository
deleted file mode 100644
index e8696c5..0000000
--- a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene/META-INF
diff --git a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Root b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Tag b/eclipse/plugins/org.apache.lucene/META-INF/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/META-INF/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.lucene/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/about.html b/eclipse/plugins/org.apache.lucene/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CHANGES.txt b/eclipse/plugins/org.apache.lucene/about_files/CHANGES.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CVS/Entries b/eclipse/plugins/org.apache.lucene/about_files/CVS/Entries
deleted file mode 100644
index 7685cf6..0000000
--- a/eclipse/plugins/org.apache.lucene/about_files/CVS/Entries
+++ /dev/null
@@ -1,4 +0,0 @@
-/CHANGES.txt/1.1.2.1.2.1/Tue Apr 20 19:46:38 2010/-ko/Tv2_9_1
-/LICENSE.txt/1.1.2.1/Mon Nov 10 16:46:57 2008/-ko/Tv2_9_1
-/NOTICE.txt/1.1.2.1.2.1/Tue Apr 20 19:57:44 2010/-ko/Tv2_9_1
-/README.txt/1.1.2.1.2.1/Tue Apr 20 19:57:44 2010/-ko/Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CVS/Repository b/eclipse/plugins/org.apache.lucene/about_files/CVS/Repository
deleted file mode 100644
index be58ee4..0000000
--- a/eclipse/plugins/org.apache.lucene/about_files/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene/about_files
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CVS/Root b/eclipse/plugins/org.apache.lucene/about_files/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/about_files/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/about_files/CVS/Tag b/eclipse/plugins/org.apache.lucene/about_files/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/about_files/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/about_files/LICENSE.txt b/eclipse/plugins/org.apache.lucene/about_files/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/about_files/NOTICE.txt b/eclipse/plugins/org.apache.lucene/about_files/NOTICE.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/about_files/README.txt b/eclipse/plugins/org.apache.lucene/about_files/README.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/build.properties b/eclipse/plugins/org.apache.lucene/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/plugin.properties b/eclipse/plugins/org.apache.lucene/plugin.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/readme-bundles.txt b/eclipse/plugins/org.apache.lucene/readme-bundles.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Entries b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Entries
deleted file mode 100644
index 8918c6a..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Entries
+++ /dev/null
@@ -1,7 +0,0 @@
-D/META-INF////
-/about.html/1.1.2.3.4.1.2.2/Fri Jan 21 17:20:15 2011/-ko/Tv2_9_1
-D/about_files////
-/build.properties/1.1.2.4.4.1/Wed Jan  7 08:16:14 2009/-ko/Tv2_9_1
-D/org////
-/plugin.properties/1.1.2.1/Tue May 15 01:44:26 2007/-ko/Tv2_9_1
-D/src////
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Repository b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Repository
deleted file mode 100644
index a2685b9..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene/source-bundle
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Root b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Tag b/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Entries b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Entries
deleted file mode 100644
index b46ddd8..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Entries
+++ /dev/null
@@ -1 +0,0 @@
-/MANIFEST.MF/1.1.2.5.4.1.2.1/Tue Apr 20 19:57:44 2010/-ko/Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Repository b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Repository
deleted file mode 100644
index 8d5c782..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene/source-bundle/META-INF
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Root b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Tag b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/MANIFEST.MF b/eclipse/plugins/org.apache.lucene/source-bundle/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about.html b/eclipse/plugins/org.apache.lucene/source-bundle/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CHANGES.txt b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CHANGES.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Entries b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Entries
deleted file mode 100644
index 8c03103..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Entries
+++ /dev/null
@@ -1,4 +0,0 @@
-/CHANGES.txt/1.1.2.1/Mon Nov 10 16:46:53 2008/-ko/Tv2_9_1
-/LICENSE.txt/1.1.2.1/Mon Nov 10 16:46:53 2008/-ko/Tv2_9_1
-/NOTICE.txt/1.1.2.1/Mon Nov 10 16:46:53 2008/-ko/Tv2_9_1
-/README.txt/1.1.2.1/Mon Nov 10 16:46:53 2008/-ko/Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Repository b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Repository
deleted file mode 100644
index 532ad3d..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.orbit/org.apache.lucene/source-bundle/about_files
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Root b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Root
deleted file mode 100644
index 24126f4..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:extssh:caniszczyk at dev.eclipse.org:/cvsroot/tools
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Tag b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Tag
deleted file mode 100644
index 3114c57..0000000
--- a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-Tv2_9_1
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/LICENSE.txt b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/LICENSE.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/NOTICE.txt b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/NOTICE.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/about_files/README.txt b/eclipse/plugins/org.apache.lucene/source-bundle/about_files/README.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/build.properties b/eclipse/plugins/org.apache.lucene/source-bundle/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.apache.lucene/source-bundle/plugin.properties b/eclipse/plugins/org.apache.lucene/source-bundle/plugin.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java b/eclipse/plugins/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java b/eclipse/plugins/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java b/eclipse/plugins/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateConversionSupport.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateConversionSupport.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateToStringConverter.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/DateToStringConverter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanConverter.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToBooleanConverter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToByteConverter.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToByteConverter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToShortConverter.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/StringToShortConverter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ObjectToPrimitiveValidator.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ObjectToPrimitiveValidator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ReadOnlyValidator.java b/eclipse/plugins/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/ReadOnlyValidator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/hpux/PA_RISC.mak b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/hpux/PA_RISC.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/hpux/ia64_32.mak b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/hpux/ia64_32.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/qnx/Makefile b/eclipse/plugins/org.eclipse.core.filesystem/natives/unix/qnx/Makefile
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/SWTFactory.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.properties b/eclipse/plugins/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewMessages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/.classpath b/eclipse/plugins/org.eclipse.equinox.app/.classpath
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/.project b/eclipse/plugins/org.eclipse.equinox.app/.project
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.core.resources.prefs b/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.core.resources.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.jdt.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.jdt.ui.prefs b/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.jdt.ui.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.pde.core.prefs b/eclipse/plugins/org.eclipse.equinox.app/.settings/org.eclipse.pde.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.app/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/about.html b/eclipse/plugins/org.eclipse.equinox.app/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/build.properties b/eclipse/plugins/org.eclipse.equinox.app/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/plugin.properties b/eclipse/plugins/org.eclipse.equinox.app/plugin.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/plugin.xml b/eclipse/plugins/org.eclipse.equinox.app/plugin.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/schema/applications.exsd b/eclipse/plugins/org.eclipse.equinox.app/schema/applications.exsd
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/app/IApplication.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/app/IApplication.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Activator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/AppCommands.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppDescriptor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseAppHandle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/EclipseScheduledApplication.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/ErrorApplication.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Messages.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/Messages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/messages.properties b/eclipse/plugins/org.eclipse.equinox.app/src/org/eclipse/equinox/internal/app/messages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationAdminPermission.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationAdminPermission.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationDescriptor.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationDescriptor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationException.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationException.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationHandle.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ApplicationHandle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ScheduledApplication.java b/eclipse/plugins/org.eclipse.equinox.app/src/org/osgi/service/application/ScheduledApplication.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/PlatformLogWriter.java b/eclipse/plugins/org.eclipse.equinox.common/src/org/eclipse/core/internal/runtime/PlatformLogWriter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.coordinator/about.html b/eclipse/plugins/org.eclipse.equinox.coordinator/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.coordinator/about_files/LICENSE-2.0.txt b/eclipse/plugins/org.eclipse.equinox.coordinator/about_files/LICENSE-2.0.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.ds/src/org/apache/felix/scr/package.html b/eclipse/plugins/org.eclipse.equinox.ds/src/org/apache/felix/scr/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/.project b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/.project
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/about.html b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/build.properties b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/customBuildCallbacks.xml b/eclipse/plugins/org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.motif.linux.x86/customBuildCallbacks.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.classpath b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.classpath
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.project b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.project
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.settings/org.eclipse.jdt.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.settings/org.eclipse.jdt.ui.prefs b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.settings/org.eclipse.jdt.ui.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.settings/org.eclipse.pde.core.prefs b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/.settings/org.eclipse.pde.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/OSGI-INF/importexport.xml b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/OSGI-INF/importexport.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/P2 Replication.launch b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/P2 Replication.launch
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/build.properties b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/plugin.properties b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/plugin.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/plugin.xml b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/plugin.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/P2ImportExport.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/P2ImportExport.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/Constants.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/Constants.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/ImportExportImpl.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/ImportExportImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/Messages.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/Messages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/messages.properties b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/messages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/AbstractWizard.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/AbstractWizard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportPage.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/internal/wizard/ExportWizard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FWriter.java b/eclipse/plugins/org.eclipse.equinox.p2.ui.importexport/src/org/eclipse/equinox/internal/p2/importexport/persistence/P2FWriter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.gif b/eclipse/plugins/org.eclipse.equinox.p2.ui/icons/obj/iu_patch_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.equinox.transforms.xslt/about.html b/eclipse/plugins/org.eclipse.equinox.transforms.xslt/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.apt.core/scripts/make_set_date_suffix_cmd.sh b/eclipse/plugins/org.eclipse.jdt.apt.core/scripts/make_set_date_suffix_cmd.sh
old mode 100644
new mode 100755
diff --git a/eclipse/plugins/org.eclipse.jdt.core/scripts/export-ejavac_linux.xml b/eclipse/plugins/org.eclipse.jdt.core/scripts/export-ejavac_linux.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.gif b/eclipse/plugins/org.eclipse.jdt.debug.ui/icons/full/elcl16/var_cntnt_prvdr.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook.gif b/eclipse/plugins/org.eclipse.jdt.debug.ui/icons/full/etool16/new_sbook.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java b/eclipse/plugins/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/launcher/DebugTypeSelectionDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.junit4.runtime/scripts/exportplugin.xml b/eclipse/plugins/org.eclipse.jdt.junit4.runtime/scripts/exportplugin.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/BasicCompilationUnitEditorActionContributor.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/BasicCompilationUnitEditorActionContributor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/HTMLTagCompletionProposalComputer.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/HTMLTagCompletionProposalComputer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocCompletionProcessor.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/javadoc/JavadocCompletionProcessor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/folding/DefaultJavaFoldingStructureProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/java/CompletionProposalCollector.java b/eclipse/plugins/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/text/java/CompletionProposalCollector.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/wizard/package.html b/eclipse/plugins/org.eclipse.jface.databinding/src/org/eclipse/jface/databinding/wizard/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/package.html b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/revisions/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/package.html b/eclipse/plugins/org.eclipse.jface.text/src/org/eclipse/jface/internal/text/source/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/UniversalUniqueIdentifier.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/UniversalUniqueIdentifier.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/FilteredServiceListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceReferenceImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistrationImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceRegistry.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java b/eclipse/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/internal/serviceregistry/ServiceUse.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogWriter.java b/eclipse/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseLogWriter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.api.tools.ui/icons/full/ovr16/warning_ovr.gif b/eclipse/plugins/org.eclipse.pde.api.tools.ui/icons/full/ovr16/warning_ovr.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.api.tools/scripts/buildApiToolsAntSupportJar.xml b/eclipse/plugins/org.eclipse.pde.api.tools/scripts/buildApiToolsAntSupportJar.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IConfigurationProperty.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/iproduct/IConfigurationProperty.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractBundleContainer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/AbstractTargetHandle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/DirectoryBundleContainer.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/DirectoryBundleContainer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/FeatureBundleContainer.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/FeatureBundleContainer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/LocalTargetHandle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/Messages.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/Messages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/Messages.properties b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/Messages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ProfileBundleContainer.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ProfileBundleContainer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ResolvedBundle.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/ResolvedBundle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinition.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinitionPersistenceHelper.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetDefinitionPersistenceHelper.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/TargetPlatformService.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/WorkspaceFileTargetHandle.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/WorkspaceFileTargetHandle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/VMUtil.java b/eclipse/plugins/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/util/VMUtil.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/concepts/target.htm b/eclipse/plugins/org.eclipse.pde.doc.user/concepts/target.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/category_editor/definition_page.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/category_editor/definition_page.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/dependencies.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/dependencies.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/licensing.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/product_editor/licensing.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/content_page.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/content_page.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/definition_page.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/definition_page.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/environment_page.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/environment_page.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/target_editor.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/editors/target_editor/target_editor.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/export_wizards/export_target.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/export_wizards/export_target.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/file_wizards/new_category.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/file_wizards/new_category.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/launchers/arguments.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/launchers/arguments.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/launchers/plugins.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/launchers/plugins.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/preference_pages/runtime_classpath_properties.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/preference_pages/runtime_classpath_properties.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_arguments_tab.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_arguments_tab.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_content_tab.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_content_tab.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_environment_tab.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_environment_tab.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_implicit_tab.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_implicit_tab.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_locations_tab.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_locations_tab.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/edit_target_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/implicit_plugin_selection_dialog.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/implicit_plugin_selection_dialog.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/import_arguments_dialog.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/import_arguments_dialog.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_add_features_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_add_features_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_add_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_add_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_directory_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_directory_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_feature_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_feature_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_installation_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_installation_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_site_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_edit_site_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_preview.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/location_preview.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/move_target_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/move_target_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/new_target_wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/target_shared/new_target_wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/views/target_platform_state.htm b/eclipse/plugins/org.eclipse.pde.doc.user/guide/tools/views/target_platform_state.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/apiconsumeruse-reportconversion-ant-task.htm b/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/apiconsumeruse-reportconversion-ant-task.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/apimigration-ant-task.htm b/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/apimigration-ant-task.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/apimigration-reportconversion-ant-task.htm b/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/apimigration-reportconversion-ant-task.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/deprecation-ant-task.htm b/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/deprecation-ant-task.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/deprecation-reportconversion-ant-task.htm b/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/ant-tasks/deprecation-reportconversion-ant-task.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/wizards/ref-apiuse-patterns-wizard.htm b/eclipse/plugins/org.eclipse.pde.doc.user/reference/api-tooling/wizards/ref-apiuse-patterns-wizard.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.doc.user/tasks/pde_compiler_options.htm b/eclipse/plugins/org.eclipse.pde.doc.user/tasks/pde_compiler_options.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.png b/eclipse/plugins/org.eclipse.pde.ds.ui/icons/wizban/defcon_wiz.png
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.gif b/eclipse/plugins/org.eclipse.pde.runtime/icons/obj16/frgmt_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.runtime/icons/obj16/plugins_obj.gif b/eclipse/plugins/org.eclipse.pde.runtime/icons/obj16/plugins_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.core/.settings/org.eclipse.core.resources.prefs b/eclipse/plugins/org.eclipse.pde.ua.core/.settings/org.eclipse.core.resources.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.core.prefs b/eclipse/plugins/org.eclipse.pde.ua.core/.settings/org.eclipse.pde.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/.settings/org.eclipse.core.resources.prefs b/eclipse/plugins/org.eclipse.pde.ua.ui/.settings/org.eclipse.core.resources.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.core.prefs b/eclipse/plugins/org.eclipse.pde.ua.ui/.settings/org.eclipse.pde.core.prefs
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/etool16/new_cheatsheet_wiz.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_composite_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_conclusion_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_intro_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_item_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_simple_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_subitem_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_taskgroup_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/cheatsheet_unsupported_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_anchor_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_leaftopic_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_link_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.gif b/eclipse/plugins/org.eclipse.pde.ua.ui/icons/obj16/toc_topic_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractSubDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/CSAbstractSubDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSMaster.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/ICSMaster.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSBlock.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSBlock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSContentProvider.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSContentProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditor.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditorContributor.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSEditorContributor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFileValidator.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFileValidator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFormOutlinePage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSFormOutlinePage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSGroupValidator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContext.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContext.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContextManager.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSInputContextManager.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSMasterTreeSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/CompCSPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAbstractAddAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAbstractAddAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddGroupAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddGroupAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddTaskAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSAddTaskAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSRemoveTaskObjectAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/actions/CompCSRemoveTaskObjectAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSConclusionTextListener.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSConclusionTextListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSEnclosingTextDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSIntroductionTextListener.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSIntroductionTextListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskGroupDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/comp/details/CompCSTaskGroupDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/ISimpleCSCommandKeyListener.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/ISimpleCSCommandKeyListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/NewCommandKeyEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSBlock.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSBlock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSCommandManager.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSContentProvider.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSContentProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSDefinitionPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditor.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditorContributor.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSEditorContributor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSFormOutlinePage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSFormOutlinePage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContext.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContext.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContextManager.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSInputContextManager.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSMasterTreeSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSSourcePage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/SimpleCSSourcePage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddStepAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddStepAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddSubStepAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSAddSubStepAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSPreviewAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSPreviewAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveRunObjectAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveRunObjectAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveStepAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveStepAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveSubStepAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/actions/SimpleCSRemoveSubStepAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandComboPart.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandComboPart.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSCommandDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSHelpDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSIntroDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSItemDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/cheatsheet/simple/details/SimpleCSSubItemDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocBlock.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocBlock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocContentProvider.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocContentProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDragAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocDropAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditorContributor.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocEditorContributor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFileValidator.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFileValidator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFoldingStructureProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFormOutlinePage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocFormOutlinePage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHTMLTitleUtil.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHTMLTitleUtil.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocHyperlinkDetector.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContext.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContext.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContextManager.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocInputContextManager.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocSourcePage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/TocTreeSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddAnchorAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddAnchorAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddLinkAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddLinkAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddObjectAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddObjectAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddTopicAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocAddTopicAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/actions/TocRemoveObjectAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAbstractDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAnchorDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocAnchorDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocLinkDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocLinkDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocTopicDetails.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/editor/toc/details/TocTopicDetails.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/BaseCSCreationOperation.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/BaseCSCreationOperation.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSCategoryTrackerUtil.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSFileWizardPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CSFileWizardPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CompCSCreationOperation.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/CompCSCreationOperation.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/IRegisterCSData.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/IRegisterCSData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCSFileWizard.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCSFileWizard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCategoryNameDialog.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewCategoryNameDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewSimpleCSFileWizard.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/NewSimpleCSFileWizard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSOperation.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSOperation.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCSWizardPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCompCSWizardPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterCompCSWizardPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterSimpleCSWizardPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/RegisterSimpleCSWizardPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSCreationOperation.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSCreationOperation.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSFileWizardPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/cheatsheet/SimpleCSFileWizardPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/NewTocFileWizard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocOperation.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java b/eclipse/plugins/org.eclipse.pde.ua.ui/src/org/eclipse/pde/internal/ua/ui/wizards/toc/TocWizardPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/Dictionary.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/Dictionary.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryImpl.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryService.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryService.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryServiceImpl.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiService/java/DictionaryServiceImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/$activator$.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/$activator$.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/Dictionary.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/Dictionary.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryImpl.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryService.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryService.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryServiceImpl.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.0/helloOSGiServiceComponent/java/DictionaryServiceImpl.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/OSGI-INF/component.xml b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/OSGI-INF/component.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/build.properties b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/java/ServiceComponent.java b/eclipse/plugins/org.eclipse.pde.ui.templates/templates_3.5/OSGiEventAdmin/java/ServiceComponent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FeatureSelectionDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FolderSelectionDialog.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/FolderSelectionDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/dialogs/PluginSelectionDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ArgumentsSection.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ArgumentsSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/DefinitionPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/EnvironmentSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/ImplicitDependenciesSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/InformationSection.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/InformationSection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/JRESection.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/JRESection.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditorContributor.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/targetdefinition/TargetEditorContributor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java b/eclipse/plugins/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/views/target/StateViewPage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/images/readmeviewcommand.png b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/images/readmeviewcommand.png
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/product_open_file.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/product_open_file.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_bindings.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_bindings.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_commands.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_commands.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_expressions.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_expressions.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_handlers.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_handlers.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_menus.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/workbench_cmd_menus.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/wrkAdv_commands_handlers.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/wrkAdv_commands_handlers.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.isv/guide/wrkAdv_services.htm b/eclipse/plugins/org.eclipse.platform.doc.isv/guide/wrkAdv_services.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/qs-93a_project_builder_targets.htm b/eclipse/plugins/org.eclipse.platform.doc.user/gettingStarted/qs-93a_project_builder_targets.htm
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.carbon.macosx/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/about.html b/eclipse/plugins/org.eclipse.swt.carbon.macosx/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.properties b/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.xml b/eclipse/plugins/org.eclipse.swt.carbon.macosx/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.carbon.macosx/fragment.properties b/eclipse/plugins/org.eclipse.swt.carbon.macosx/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/about.html b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.properties b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.xml b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/fragment.properties b/eclipse/plugins/org.eclipse.swt.cocoa.macosx.x86_64/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about.html b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.properties b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.xml b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.cocoa.macosx/fragment.properties b/eclipse/plugins/org.eclipse.swt.cocoa.macosx/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about.html b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/about_cairo.html b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/about_cairo.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/lgpl-v21.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/lgpl-v21.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/pixman-licenses.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/about_files/pixman-licenses.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/build.properties b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/fragment.properties b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about.html b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/about_cairo.html b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/about_cairo.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/lgpl-v21.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/lgpl-v21.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/pixman-licenses.txt b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/about_files/pixman-licenses.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.properties b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/fragment.properties b/eclipse/plugins/org.eclipse.swt.gtk.aix.ppc64/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about.html b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/lgpl-v21.txt b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/lgpl-v21.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/pixman-licenses.txt b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/about_files/pixman-licenses.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/build.properties b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/fragment.properties b/eclipse/plugins/org.eclipse.swt.gtk.hpux.ia64_32/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/META-INF/MANIFEST.MF
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about.html b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/IJG_README b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/IJG_README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/about_cairo.html b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/about_cairo.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/lgpl-v21.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/mpl-v11.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/pixman-licenses.txt b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/about_files/pixman-licenses.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/build.xml
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties b/eclipse/plugins/org.eclipse.swt.gtk.linux.ppc64/fragment.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/.classpath_cocoa b/eclipse/plugins/org.eclipse.swt/.classpath_cocoa
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/.classpath_motif b/eclipse/plugins/org.eclipse.swt/.classpath_motif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/.classpath_photon b/eclipse/plugins/org.eclipse.swt/.classpath_photon
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/.classpath_win32 b/eclipse/plugins/org.eclipse.swt/.classpath_win32
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/.project_classpath_builder b/eclipse/plugins/org.eclipse.swt/.project_classpath_builder
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/.project_normal b/eclipse/plugins/org.eclipse.swt/.project_normal
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT AWT/cocoa/org/eclipse/swt/awt/SWT_AWT.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Voyager.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Browser/photon/org/eclipse/swt/browser/Voyager.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/AnimatedProgress.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BusyIndicator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CLabel.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ControlEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PopupList.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PopupList.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ST.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ST.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/SashForm.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ScrolledComposite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StackLayout.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextContent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextContent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTree.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTree.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeEditor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableTreeItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangedEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangedEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangingEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangingEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ViewForm.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DND.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DND.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/ByteArrayTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/ByteArrayTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Clipboard.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Clipboard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DragSource.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DragSource.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DropTarget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/DropTarget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/FileTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/FileTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/RTFTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/RTFTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TextTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TextTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Transfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/Transfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TransferData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/motif/org/eclipse/swt/dnd/TransferData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/ByteArrayTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/ByteArrayTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Clipboard.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Clipboard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DragSource.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DragSource.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DropTarget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/DropTarget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/FileTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/FileTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/RTFTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/RTFTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TextTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TextTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Transfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/Transfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TransferData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/photon/org/eclipse/swt/dnd/TransferData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/ByteArrayTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Clipboard.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/FileTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/OleEnumFORMATETC.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/RTFTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TextTransfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/Transfer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/TransferData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcominit.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefLocalizedString.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefService.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/internal/ole/win32/COMObject.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OLE.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleAutomation.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleClientSite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleControlSite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventSink.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFrame.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFunctionDescription.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleFunctionDescription.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleParameterDescription.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleParameterDescription.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyChangeSink.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyDescription.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OlePropertyDescription.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/Variant.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/carbon/org/eclipse/swt/opengl/GLCanvas.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/carbon/org/eclipse/swt/opengl/GLCanvas.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/cocoa/org/eclipse/swt/opengl/GLCanvas.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/common/org/eclipse/swt/opengl/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/common/org/eclipse/swt/opengl/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/GLX.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/glx/org/eclipse/swt/internal/opengl/glx/XVisualInfo.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/LAYERPLANEDESCRIPTOR.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/PIXELFORMATDESCRIPTOR.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/PIXELFORMATDESCRIPTOR.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT OpenGL/win32/org/eclipse/swt/internal/opengl/win32/WGL.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cairo/library/cairo_custom.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/library/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.c
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/library/cocoa_custom.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/Cocoa.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/NSSize.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/carbon/org/eclipse/swt/internal/cocoa/NSSize.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/make_macosx.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.c
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_custom.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/Platform.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPoint.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSRect.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSize.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/PMResolution.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/PMResolution.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_aix.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_freebsd.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_hpux.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_solaris_x86.mak
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/Lock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/motif/library/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/Lock.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/motif/org/eclipse/swt/internal/Lock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/photon/library/build.sh
old mode 100644
new mode 100755
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtWebClient2Data_t.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT PI/photon/org/eclipse/swt/internal/photon/PtWebClient2Data_t.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/PrintDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/cocoa/org/eclipse/swt/printing/Printer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/PrinterData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/common/org/eclipse/swt/printing/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/PrintDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/PrintDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/motif/org/eclipse/swt/printing/Printer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/PrintDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/PrintDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/Printer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/photon/org/eclipse/swt/printing/Printer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/PrintDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Printing/win32/org/eclipse/swt/printing/Printer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/cocoa/org/eclipse/swt/program/Program.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/common/org/eclipse/swt/program/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/common/org/eclipse/swt/program/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/motif/org/eclipse/swt/program/Program.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/photon/org/eclipse/swt/program/Program.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT Program/win32/org/eclipse/swt/program/Program.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/carbon/org/eclipse/swt/browser/WebKit.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/cocoa/org/eclipse/swt/browser/WebKit.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TrayItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/carbon/org/eclipse/swt/widgets/TrayItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Color.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Cursor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Device.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/DeviceData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/DeviceData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Font.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontMetrics.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontMetrics.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GCData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Image.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Path.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Pattern.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Region.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/Transform.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Caret.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Caret.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ColorDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Composite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FileDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/FontDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Group.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Label.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MessageBox.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ProgressBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scrollable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/callback.c b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/callback.c
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/callback.h b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/library/callback.h
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWT.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTError.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTError.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTException.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/SWTException.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeAdapter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeAdapter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TypedEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TypedEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Drawable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoader.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderEvent.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderEvent.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/PaletteData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/PaletteData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/Callback.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/FileFormat.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/GIFFileFormat.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/GIFFileFormat.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGAppn.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGAppn.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGArithmeticConditioningTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGComment.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGComment.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGEndOfImage.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGEndOfImage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFileFormat.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFileFormat.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFixedSizeSegment.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFrameHeader.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGFrameHeader.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGHuffmanTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGHuffmanTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGQuantizationTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGQuantizationTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGRestartInterval.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGRestartInterval.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGScanHeader.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGScanHeader.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGSegment.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGSegment.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGStartOfImage.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGStartOfImage.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/JPEGVariableSizeSegment.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataInputStream.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataInputStream.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataOutputStream.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LEDataOutputStream.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWCodec.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWCodec.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWNode.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/LZWNode.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PNGFileFormat.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PNGFileFormat.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunk.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunk.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunkReader.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngChunkReader.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngDecodingDataStream.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngDecodingDataStream.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngFileReadState.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngFileReadState.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTables.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngHuffmanTables.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIdatChunk.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIdatChunk.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIendChunk.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIendChunk.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIhdrChunk.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngIhdrChunk.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngLzBlockReader.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngLzBlockReader.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngPlteChunk.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngPlteChunk.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngTrnsChunk.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/PngTrnsChunk.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinBMPFileFormat.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinBMPFileFormat.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/WinICOFileFormat.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/image/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/FillLayout.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/GridLayout.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/RowLayout.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/layout/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Dialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Dialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Event.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Event.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Item.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Item.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Layout.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Layout.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Listener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Listener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/RunnableLock.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/RunnableLock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Synchronizer.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/Synchronizer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/package.html b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/version.txt b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/common/version.txt
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Color.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Cursor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Device.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/DeviceData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/DeviceData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Font.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontMetrics.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/FontMetrics.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GC.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/GCData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Image.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/graphics/Region.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/internal/Converter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Button.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Canvas.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Caret.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ColorDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ColorDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Combo.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Composite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Control.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Decorations.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/DirectoryDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/DirectoryDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Display.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FileDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FileDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FontDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/FontDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Group.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Label.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/List.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Menu.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MenuItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MessageBox.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/MessageBox.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ProgressBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Sash.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scale.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ScrollBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Scrollable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Shell.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Slider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Text.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/ToolItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Tracker.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Color.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Cursor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Device.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/DeviceData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/DeviceData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Font.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontMetrics.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/FontMetrics.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GC.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GCData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/GCData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Image.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/graphics/Region.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/Converter.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/internal/Converter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Button.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Button.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Canvas.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Caret.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Caret.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ColorDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ColorDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Combo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Combo.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Composite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Control.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Decorations.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/DirectoryDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/DirectoryDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Display.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FileDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FileDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FontDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/FontDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Group.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Group.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Label.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Label.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/List.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/List.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Menu.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Menu.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MenuItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MenuItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MessageBox.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/MessageBox.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ProgressBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ProgressBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Sash.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Sash.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scale.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scale.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ScrollBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ScrollBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scrollable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Scrollable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Shell.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Slider.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Slider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabFolder.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabFolder.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/TabItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Text.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Text.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/ToolItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Tracker.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/WidgetTable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/WidgetTable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Color.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Cursor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Device.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/DeviceData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/DeviceData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Font.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontMetrics.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GCData.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Image.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/Region.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Canvas.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Caret.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ColorDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Composite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Decorations.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DirectoryDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Display.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FileDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/FontDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Group.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Label.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MessageBox.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ProgressBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scrollable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/eclipse/plugins/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html b/eclipse/plugins/org.eclipse.swt/buildnotes_swt.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.text/src/org/eclipse/jface/text/TreeLineTracker.java b/eclipse/plugins/org.eclipse.text/src/org/eclipse/jface/text/TreeLineTracker.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/CarbonUIEnhancer.java b/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/CarbonUIEnhancer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/Messages.properties b/eclipse/plugins/org.eclipse.ui.carbon/src/org/eclipse/ui/internal/carbon/Messages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java b/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/editors/text/LinkedModeConfigurationBlock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/RulerMessages.java b/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/RulerMessages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/RulerMessages.properties b/eclipse/plugins/org.eclipse.ui.editors/src/org/eclipse/ui/internal/texteditor/RulerMessages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide.application/icons/full/elcl16/configs.gif b/eclipse/plugins/org.eclipse.ui.ide.application/icons/full/elcl16/configs.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide.application/icons/full/elcl16/usearch_obj.gif b/eclipse/plugins/org.eclipse.ui.ide.application/icons/full/elcl16/usearch_obj.gif
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/ide/ResourceSelectionUtil.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/ide/ResourceSelectionUtil.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterEditDialog.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/dialogs/ResourceFilterEditDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/handlers/OpenResourceHandler.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/handlers/OpenResourceHandler.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/AndFileInfoMatcher.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/AndFileInfoMatcher.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/NotFileInfoMatcher.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/NotFileInfoMatcher.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/OrFileInfoMatcher.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/OrFileInfoMatcher.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/StringFileInfoMatcher.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/misc/StringFileInfoMatcher.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/undo/AbstractResourceDescription.java b/eclipse/plugins/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/undo/AbstractResourceDescription.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/.settings/.api_filters b/eclipse/plugins/org.eclipse.ui.navigator.resources/.settings/.api_filters
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/ResourceToItemsMapper.java b/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/ResourceToItemsMapper.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoActionProvider.java b/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoActionProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoResourceAction.java b/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoResourceAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoResourceDialog.java b/eclipse/plugins/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/GotoResourceDialog.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/.options b/eclipse/plugins/org.eclipse.ui.navigator/.options
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorFrameSource.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/CommonNavigatorFrameSource.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/Policy.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/Policy.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/ExtensionSequenceNumberComparator.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/extensions/ExtensionSequenceNumberComparator.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/BackAction.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/BackAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/ForwardAction.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/ForwardAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/Frame.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/Frame.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameAction.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameList.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameListMessages.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/FrameListMessages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/GoIntoAction.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/GoIntoAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/IFrameListHelpContextIds.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/IFrameListHelpContextIds.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/IFrameSource.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/IFrameSource.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/README b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/README
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeFrame.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/TreeViewerFrameSource.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/UpAction.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/UpAction.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/messages.properties b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/messages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/package.html b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/internal/navigator/framelist/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/LinkHelperService.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/OverridePolicy.java b/eclipse/plugins/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/OverridePolicy.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/TabbedPropertyViewPlugin.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/TabbedPropertyViewPlugin.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/TabbedPropertyViewStatusCodes.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/TabbedPropertyViewStatusCodes.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/l10n/TabbedPropertyMessages.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/l10n/TabbedPropertyMessages.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/l10n/TabbedPropertyMessages.properties b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/l10n/TabbedPropertyMessages.properties
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/SectionDescriptor.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/SectionDescriptor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabDescriptor.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabDescriptor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabListContentProvider.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabListContentProvider.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyComposite.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyComposite.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyList.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyList.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistry.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistryClassSectionFilter.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistryClassSectionFilter.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistryFactory.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyRegistryFactory.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyTitle.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyTitle.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyViewer.java b/eclipse/plugins/org.eclipse.ui.views.properties.tabbed/src/org/eclipse/ui/internal/views/properties/tabbed/view/TabbedPropertyViewer.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java b/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/RulerColumnDescriptor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/package.html b/eclipse/plugins/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/rulers/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IAggregateWorkingSet.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IAggregateWorkingSet.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPersistableEditor.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IPersistableEditor.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/branding/package.html b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/branding/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/package.html b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/commands/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/dialogs/WorkingSetConfigurationBlock.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuPersistence.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/MenuPersistence.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchPartTestable.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/testing/WorkbenchPartTestable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/AbstractContributionFactory.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/AbstractContributionFactory.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/UIElement.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/UIElement.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/package.html b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/presentations/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/services/package.html b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/services/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/testing/IWorkbenchPartTestable.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/testing/IWorkbenchPartTestable.java
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/testing/package.html b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/testing/package.html
old mode 100755
new mode 100644
diff --git a/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/themes/ColorUtil.java b/eclipse/plugins/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/themes/ColorUtil.java
old mode 100755
new mode 100644
diff --git a/generatedScripts/plugins/org.apache.lucene/build.xml b/generatedScripts/plugins/org.apache.lucene/build.xml
deleted file mode 100644
index 3667429..0000000
--- a/generatedScripts/plugins/org.apache.lucene/build.xml
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.apache.lucene" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.apache.lucene"/>
-	<property name="bundleVersion" value="2.9.1.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.apache.lucene_2.9.1.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.apache.lucene for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.apache.lucene_2.9.1.201105111101.jar" basedir="${temp.folder}/org.apache.lucene_2.9.1.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.apache.lucene.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.apache.lucene_2.9.1.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.apache.lucene_2.9.1.201105111101" log="${compilation.prereq.log}">
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.apache.lucene_2.9.1.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.9.1.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.apache.lucene"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.apache.lucene_2.9.1.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.apache.lucene_2.9.1.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.apache.lucene_2.9.1.201105111101" version="2.9.1.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.apache.lucene_2.9.1.201105111101"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.apache.lucene"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.apache.lucene_2.9.1.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.apache.lucene of all the zips, jars and logs created.">
-		<delete file="${plugin.destination}/org.apache.lucene_2.9.1.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.apache.lucene_2.9.1.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.apache.lucene" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.apache.lucene.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.apache.lucene_2.9.1.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ant.core/build.xml b/generatedScripts/plugins/org.eclipse.ant.core/build.xml
deleted file mode 100644
index 1c98621..0000000
--- a/generatedScripts/plugins/org.eclipse.ant.core/build.xml
+++ /dev/null
@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ant.core" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ant.core"/>
-	<property name="bundleVersion" value="3.2.300.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ant.core_3.2.300.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ant.core for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ant.core_3.2.300.v20110510.jar" basedir="${temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ant.core @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.core.variables/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="lib/antsupportlib.jar.nestedJars">
-	</target>
-	<target name="lib/antsupportlib.jar" depends="init,lib/antsupportlib.jar.nestedJars" unless="lib/antsupportlib.jar" description="Create jar: org.eclipse.ant.core lib/antsupportlib.jar.">
-		<delete dir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<path id="lib/antsupportlib.jar.classpath">
-			<pathelement path="../org.eclipse.core.variables/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="${build.result.folder}/@dot"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.ant.core_3.2.300.v20110510/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/lib/antsupportlib.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="lib/antsupportlib.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.lib_antsupportlib.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/lib/antsupportlib.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/lib/antsupportlib.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar destfile="${build.result.folder}/lib/antsupportlib.jar" basedir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-		<delete dir="${temp.folder}/lib/antsupportlib.jar.bin"/>
-	</target>
-
-	<target name="lib/antsupportlibsrc.zip" depends="init" unless="lib/antsupportlibsrc.zip">
-		<mkdir dir="${build.result.folder}/lib"/>
-		<antcall target="zip.lib/antsupportlibsrc.zip"/>
-	</target>
-	<target name="zip.lib/antsupportlibsrc.zip">
-		<zip destfile="${build.result.folder}/lib/antsupportlibsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.lib/antsupportlibsrc.zip">
-		<copy todir="${source.destination.folder}/lib/antsupportlibsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ant.core.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<available property="lib/antsupportlib.jar" file="${build.result.folder}/lib/antsupportlib.jar"/>
-		<antcall target="lib/antsupportlib.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ant.core_3.2.300.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ant.core_3.2.300.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.variables/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.variables_3.2.500.v20110509/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<available property="lib/antsupportlibsrc.zip" file="${build.result.folder}/lib/antsupportlibsrc.zip"/>
-		<antcall target="lib/antsupportlibsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ant.core_3.2.300.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.2.300.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/lib/antsupportlib.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="lib/antsupportlib.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="lib/*.jar"/>
-				<include name="META-INF/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" version="3.2.300.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510/lib/antsupportlib.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510/lib"/>
-		<copy file="${build.result.folder}/lib/antsupportlibsrc.zip" todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510/lib" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.lib/antsupportlibsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510/lib"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ant.core_3.2.300.v20110510/lib" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/lib">
-				<include name="antsupportlib.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ant.core of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${build.result.folder}/lib/antsupportlib.jar"/>
-		<delete file="${build.result.folder}/lib/antsupportlibsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ant.core_3.2.300.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ant.core_3.2.300.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ant.core" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ant.core.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ant.core_3.2.300.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.contenttype/build.xml b/generatedScripts/plugins/org.eclipse.core.contenttype/build.xml
deleted file mode 100644
index 1643802..0000000
--- a/generatedScripts/plugins/org.eclipse.core.contenttype/build.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.contenttype" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.contenttype"/>
-	<property name="bundleVersion" value="3.4.100.v20110423-0524"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.contenttype for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar" basedir="${temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.contenttype @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.contenttype.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.contenttype_3.4.100.v20110423-0524${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.contenttype_3.4.100.v20110423-0524" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.4.100.v20110423-0524"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name=".options"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524" version="3.4.100.v20110423-0524"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.contenttype_3.4.100.v20110423-0524" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.contenttype of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.contenttype_3.4.100.v20110423-0524.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.contenttype_3.4.100.v20110423-0524.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.contenttype.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.contenttype_3.4.100.v20110423-0524.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.expressions/build.xml b/generatedScripts/plugins/org.eclipse.core.expressions/build.xml
deleted file mode 100644
index 06eb33e..0000000
--- a/generatedScripts/plugins/org.eclipse.core.expressions/build.xml
+++ /dev/null
@@ -1,354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.expressions" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.expressions"/>
-	<property name="bundleVersion" value="3.4.300.v20110228"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.expressions_3.4.300.v20110228"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.expressions for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.expressions_3.4.300.v20110228.jar" basedir="${temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.expressions @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.expressions.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.expressions_3.4.300.v20110228${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.expressions_3.4.300.v20110228" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.expressions_3.4.300.v20110228"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.4.300.v20110228"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name=".options"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228" version="3.4.300.v20110228"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.expressions_3.4.300.v20110228" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.expressions of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.expressions_3.4.300.v20110228.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.expressions_3.4.300.v20110228.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.expressions" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.expressions.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.expressions_3.4.300.v20110228.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.jobs/build.xml b/generatedScripts/plugins/org.eclipse.core.jobs/build.xml
deleted file mode 100644
index 6b7585c..0000000
--- a/generatedScripts/plugins/org.eclipse.core.jobs/build.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.jobs" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.jobs"/>
-	<property name="bundleVersion" value="3.5.100.v20110404"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.jobs for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.jobs_3.5.100.v20110404.jar" basedir="${temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.jobs @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.jobs.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.jobs_3.5.100.v20110404${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.jobs_3.5.100.v20110404" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.jobs_3.5.100.v20110404"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.5.100.v20110404"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name=".options"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404" version="3.5.100.v20110404"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.jobs_3.5.100.v20110404" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.jobs of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.jobs_3.5.100.v20110404.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.jobs_3.5.100.v20110404.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.jobs.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.jobs_3.5.100.v20110404.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.net/build.xml b/generatedScripts/plugins/org.eclipse.core.net/build.xml
deleted file mode 100644
index bd8bd1e..0000000
--- a/generatedScripts/plugins/org.eclipse.core.net/build.xml
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.net" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.net"/>
-	<property name="bundleVersion" value="1.2.100.I20110510-0800"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.net_1.2.100.I20110510-0800"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.net for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.net_1.2.100.I20110510-0800.jar" basedir="${temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.net @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.net.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.net_1.2.100.I20110510-0800${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.net_1.2.100.I20110510-0800" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.net_1.2.100.I20110510-0800"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.2.100.I20110510-0800"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="plugin.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800" version="1.2.100.I20110510-0800"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.net_1.2.100.I20110510-0800" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.net of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.net_1.2.100.I20110510-0800.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.net_1.2.100.I20110510-0800.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.net.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.net_1.2.100.I20110510-0800.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.runtime.compatibility.auth/build.xml b/generatedScripts/plugins/org.eclipse.core.runtime.compatibility.auth/build.xml
deleted file mode 100644
index 1dc81f1..0000000
--- a/generatedScripts/plugins/org.eclipse.core.runtime.compatibility.auth/build.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.runtime.compatibility.auth" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.runtime.compatibility.auth"/>
-	<property name="bundleVersion" value="3.2.200.v20110110"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.runtime.compatibility.auth for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar" basedir="${temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.runtime.compatibility.auth @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.runtime.compatibility.auth.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.2.200.v20110110"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" version="3.2.200.v20110110"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.runtime.compatibility.auth of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.runtime.compatibility.auth.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml b/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml
deleted file mode 100644
index 8ce9076..0000000
--- a/generatedScripts/plugins/org.eclipse.core.runtime.compatibility/build.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.runtime.compatibility" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.runtime.compatibility"/>
-	<property name="bundleVersion" value="3.2.100.v20100505"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.runtime.compatibility for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.jar" basedir="${temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.runtime.compatibility @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.update.configurator/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src-runtime/"			/>
-			<src path="src-boot/"			/>
-			<src path="src-model/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src-runtime/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="src-boot/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="src-model/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src-runtime/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src-boot/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src-model/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src-runtime/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src-boot/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src-model/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.runtime.compatibility.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.runtime.compatibility_3.2.100.v20100505${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.runtime.compatibility_3.2.100.v20100505" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.update.configurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.update.configurator_3.3.100.v20100512/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.2.100.v20100505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505" version="3.2.100.v20100505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.runtime.compatibility of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.runtime.compatibility.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.runtime/build.xml b/generatedScripts/plugins/org.eclipse.core.runtime/build.xml
deleted file mode 100644
index 1e7ccac..0000000
--- a/generatedScripts/plugins/org.eclipse.core.runtime/build.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.runtime" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.runtime"/>
-	<property name="bundleVersion" value="3.7.0.v20110110"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.runtime for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.runtime_3.7.0.v20110110.jar" basedir="${temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.runtime @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.runtime.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.runtime_3.7.0.v20110110${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.runtime_3.7.0.v20110110" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.runtime_3.7.0.v20110110"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.7.0.v20110110"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name=".options"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="plugin.xml"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110" version="3.7.0.v20110110"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.runtime_3.7.0.v20110110" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.runtime of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.runtime_3.7.0.v20110110.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.runtime_3.7.0.v20110110.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.runtime.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.runtime_3.7.0.v20110110.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.core.variables/build.xml b/generatedScripts/plugins/org.eclipse.core.variables/build.xml
deleted file mode 100644
index 1d69382..0000000
--- a/generatedScripts/plugins/org.eclipse.core.variables/build.xml
+++ /dev/null
@@ -1,326 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.core.variables" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.core.variables"/>
-	<property name="bundleVersion" value="3.2.500.v20110509"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.core.variables_3.2.500.v20110509"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.core.variables for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.core.variables_3.2.500.v20110509.jar" basedir="${temp.folder}/org.eclipse.core.variables_3.2.500.v20110509" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.core.variables @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.core.variables.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.core.variables_3.2.500.v20110509${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.core.variables_3.2.500.v20110509" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.core.variables_3.2.500.v20110509"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.2.500.v20110509"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509" version="3.2.500.v20110509"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.core.variables_3.2.500.v20110509" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.core.variables of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.core.variables_3.2.500.v20110509.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.core.variables_3.2.500.v20110509.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.variables" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.core.variables.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.core.variables_3.2.500.v20110509.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.filetransfer/build.xml b/generatedScripts/plugins/org.eclipse.ecf.filetransfer/build.xml
deleted file mode 100644
index 6ccf9e3..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.filetransfer/build.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.filetransfer" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.filetransfer"/>
-	<property name="bundleVersion" value="5.0.0.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.filetransfer for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.filetransfer_5.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.filetransfer @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.ecf/bin/"/>
-			<pathelement path="../org.eclipse.ecf/@dot"/>
-			<pathelement path="../org.eclipse.ecf.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.ssl/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.filetransfer.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.filetransfer_5.0.0.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.filetransfer_5.0.0.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.ssl_1.0.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="5.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101" version="5.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.filetransfer_5.0.0.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.filetransfer of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.filetransfer_5.0.0.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.filetransfer_5.0.0.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.filetransfer" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.filetransfer.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.filetransfer_5.0.0.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.identity/build.xml b/generatedScripts/plugins/org.eclipse.ecf.identity/build.xml
deleted file mode 100644
index d6b1542..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.identity/build.xml
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.identity" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.identity"/>
-	<property name="bundleVersion" value="3.1.100.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.identity for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.identity_3.1.100.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.identity @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.identity.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.identity_3.1.100.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.identity_3.1.100.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.identity_3.1.100.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.1.100.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="schema/"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101" version="3.1.100.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.identity_3.1.100.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.identity of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.identity_3.1.100.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.identity_3.1.100.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.identity.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.identity_3.1.100.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml b/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml
deleted file mode 100644
index d56ca9d..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl/build.xml
+++ /dev/null
@@ -1,393 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"/>
-	<property name="bundleVersion" value="1.0.0.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient.ssl for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient.ssl @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/bin/"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer.httpclient/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/jakarta-commons-httpclient-3.1.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/commons-codec.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer/@dot"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer.ssl/@dot"/>
-			<pathelement path="../org.eclipse.core.net/bin/"/>
-			<pathelement path="../org.eclipse.core.net/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.ecf/bin/"/>
-			<pathelement path="../org.eclipse.ecf/@dot"/>
-			<pathelement path="../org.eclipse.ecf.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.ssl/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient.ssl.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_64_1.1.0.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_1.1.200.I20110419-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.ssl_1.0.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_64_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net_1.2.100.I20110510-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.filetransfer_5.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="extraManifests" value="${basedir}/../org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="asl-v20.txt"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" version="1.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"/>
-			<param name="extraManifests" value="${basedir}/../org.eclipse.ecf.provider.filetransfer.httpclient/META-INF/MANIFEST.MF"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="asl-v20.txt"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient.ssl of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient.ssl.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_1.0.0.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml b/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml
deleted file mode 100644
index 3ff7b82..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.httpclient/build.xml
+++ /dev/null
@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.provider.filetransfer.httpclient" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.provider.filetransfer.httpclient"/>
-	<property name="bundleVersion" value="4.0.0.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.httpclient @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../../../../../../../../../usr/share/java/jakarta-commons-httpclient-3.1.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/commons-codec.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer/@dot"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer.ssl/@dot"/>
-			<pathelement path="../org.eclipse.core.net/bin/"/>
-			<pathelement path="../org.eclipse.core.net/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.ecf/bin/"/>
-			<pathelement path="../org.eclipse.ecf/@dot"/>
-			<pathelement path="../org.eclipse.ecf.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.ssl/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_64_1.1.0.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_1.1.200.I20110419-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.ssl_1.0.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_64_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net_1.2.100.I20110510-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.filetransfer_5.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="4.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="asl-v20.txt"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" version="4.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="asl-v20.txt"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer.httpclient" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.provider.filetransfer.httpclient.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.httpclient_4.0.0.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.ssl/build.xml b/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.ssl/build.xml
deleted file mode 100644
index 7da5f35..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer.ssl/build.xml
+++ /dev/null
@@ -1,362 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.provider.filetransfer.ssl" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.provider.filetransfer.ssl"/>
-	<property name="bundleVersion" value="1.0.0.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.provider.filetransfer.ssl for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer.ssl @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.provider.filetransfer/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.net/bin/"/>
-			<pathelement path="../org.eclipse.core.net/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.ecf/bin/"/>
-			<pathelement path="../org.eclipse.ecf/@dot"/>
-			<pathelement path="../org.eclipse.ecf.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.ssl/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.provider.filetransfer.ssl.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_64_1.1.0.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net_1.2.100.I20110510-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.filetransfer_5.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_1.1.200.I20110419-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.ssl_1.0.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_64_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="extraManifests" value="${basedir}/../org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" version="1.0.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"/>
-			<param name="extraManifests" value="${basedir}/../org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.provider.filetransfer.ssl of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer.ssl" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.provider.filetransfer.ssl.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer.ssl_1.0.0.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer/build.xml b/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer/build.xml
deleted file mode 100644
index e39e521..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.provider.filetransfer/build.xml
+++ /dev/null
@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.provider.filetransfer" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.provider.filetransfer"/>
-	<property name="bundleVersion" value="3.2.0.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.provider.filetransfer for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.provider.filetransfer @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.net/bin/"/>
-			<pathelement path="../org.eclipse.core.net/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.ecf/bin/"/>
-			<pathelement path="../org.eclipse.ecf/@dot"/>
-			<pathelement path="../org.eclipse.ecf.ssl/bin/"/>
-			<pathelement path="../org.eclipse.ecf.ssl/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/bin/"/>
-			<pathelement path="../org.eclipse.ecf.filetransfer/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.provider.filetransfer.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_64_1.1.0.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net_1.2.100.I20110510-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.filetransfer/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.filetransfer_5.0.0.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_1.1.200.I20110419-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.ssl/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.ssl_1.0.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_64_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.2.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" version="3.2.0.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.provider.filetransfer of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.provider.filetransfer" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.provider.filetransfer.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.provider.filetransfer_3.2.0.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf.ssl/build.xml b/generatedScripts/plugins/org.eclipse.ecf.ssl/build.xml
deleted file mode 100644
index 7f6842e..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf.ssl/build.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf.ssl" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf.ssl"/>
-	<property name="bundleVersion" value="1.0.100.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf.ssl_1.0.100.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf.ssl for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf.ssl_1.0.100.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf.ssl @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.ecf/bin/"/>
-			<pathelement path="../org.eclipse.ecf/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.ssl.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf.ssl_1.0.100.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf.ssl_1.0.100.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.100.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="extraManifests" value="${basedir}/../org.eclipse.ecf/META-INF/MANIFEST.MF"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101" version="1.0.100.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101"/>
-			<param name="extraManifests" value="${basedir}/../org.eclipse.ecf/META-INF/MANIFEST.MF"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf.ssl_1.0.100.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf.ssl of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.ssl_1.0.100.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf.ssl_1.0.100.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.ssl" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.ssl.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf.ssl_1.0.100.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.ecf/build.xml b/generatedScripts/plugins/org.eclipse.ecf/build.xml
deleted file mode 100644
index 8683744..0000000
--- a/generatedScripts/plugins/org.eclipse.ecf/build.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.ecf" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.ecf"/>
-	<property name="bundleVersion" value="3.1.200.201105111101"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.ecf_3.1.200.201105111101"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.ecf for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.ecf_3.1.200.201105111101.jar" basedir="${temp.folder}/org.eclipse.ecf_3.1.200.201105111101" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.ecf @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/bin/"/>
-			<pathelement path="../org.eclipse.equinox.concurrent/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.ecf.identity/bin/"/>
-			<pathelement path="../org.eclipse.ecf.identity/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.ecf.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.ecf_3.1.200.201105111101${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.ecf_3.1.200.201105111101" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf.identity/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ecf.identity_3.1.100.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.ecf_3.1.200.201105111101"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.1.200.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="schema/"/>
-				<include name="about.properties"/>
-				<include name="ecf32.png"/>
-				<include name="about.ini"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101" version="3.1.200.201105111101"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-				<include name="about.properties"/>
-				<include name="about.ini"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.ecf_3.1.200.201105111101" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.ecf of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf_3.1.200.201105111101.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.ecf_3.1.200.201105111101.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ecf" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.ecf.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.ecf_3.1.200.201105111101.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.app/build.xml b/generatedScripts/plugins/org.eclipse.equinox.app/build.xml
deleted file mode 100644
index cf527ac..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.app/build.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.app" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.app"/>
-	<property name="bundleVersion" value="1.3.100.v20110321"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.2}"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.app for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.app_1.3.100.v20110321.jar" basedir="${temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.app @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.app.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.app_1.3.100.v20110321${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.app_1.3.100.v20110321" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.app_1.3.100.v20110321"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.3.100.v20110321"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="plugin.xml"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321" version="1.3.100.v20110321"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.app_1.3.100.v20110321" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.app of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.app_1.3.100.v20110321.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.app_1.3.100.v20110321.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.app.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.app_1.3.100.v20110321.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.common/build.xml b/generatedScripts/plugins/org.eclipse.equinox.common/build.xml
deleted file mode 100644
index 0747450..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.common/build.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.common" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.common"/>
-	<property name="bundleVersion" value="3.6.0.v20110506"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.common for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.common_3.6.0.v20110506.jar" basedir="${temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.common @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.common.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.common_3.6.0.v20110506${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.common_3.6.0.v20110506" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.common_3.6.0.v20110506"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.6.0.v20110506"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506" version="3.6.0.v20110506"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.common_3.6.0.v20110506" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.common of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.common_3.6.0.v20110506.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.common_3.6.0.v20110506.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.common.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.common_3.6.0.v20110506.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.concurrent/build.xml b/generatedScripts/plugins/org.eclipse.equinox.concurrent/build.xml
deleted file mode 100644
index 8b648c4..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.concurrent/build.xml
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.concurrent" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.concurrent"/>
-	<property name="bundleVersion" value="1.0.200.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.concurrent_1.0.200.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.concurrent for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.concurrent_1.0.200.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.concurrent @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.concurrent.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.concurrent_1.0.200.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.concurrent_1.0.200.v20110502" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.200.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502" version="1.0.200.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.concurrent_1.0.200.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.concurrent of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.concurrent_1.0.200.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.concurrent_1.0.200.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.concurrent" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.concurrent.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.concurrent_1.0.200.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.frameworkadmin.equinox/build.xml b/generatedScripts/plugins/org.eclipse.equinox.frameworkadmin.equinox/build.xml
deleted file mode 100644
index e34d007..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.frameworkadmin.equinox/build.xml
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.frameworkadmin.equinox" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.frameworkadmin.equinox"/>
-	<property name="bundleVersion" value="1.0.300.v20110506"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.frameworkadmin.equinox for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506.jar" basedir="${temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.frameworkadmin.equinox @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.frameworkadmin.equinox.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.300.v20110506"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" version="1.0.300.v20110506"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.frameworkadmin.equinox of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.frameworkadmin.equinox.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.frameworkadmin/build.xml b/generatedScripts/plugins/org.eclipse.equinox.frameworkadmin/build.xml
deleted file mode 100644
index 921e59e..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.frameworkadmin/build.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.frameworkadmin" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.frameworkadmin"/>
-	<property name="bundleVersion" value="2.0.0.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.frameworkadmin for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.frameworkadmin @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.frameworkadmin.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.0.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" version="2.0.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.frameworkadmin of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.frameworkadmin.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml b/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml
deleted file mode 100644
index 5672067..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.http.jetty_2.0.0/build.xml
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.http.jetty" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.http.jetty"/>
-	<property name="bundleVersion" value="2.0.100.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.http.jetty for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.http.jetty_2.0.100.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.http.jetty @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.http.servlet/bin/"/>
-			<pathelement path="../org.eclipse.equinox.http.servlet/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-log4j.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-oro.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-regexp.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-resolver.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-xalan2.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-net.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jai.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-javamail.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jdepend.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jmf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jsch.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.http.jetty.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.http.jetty_2.0.100.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.http.jetty_2.0.100.v20110502" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.http.servlet/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.http.servlet_1.1.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.0.100.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="OSGI-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502" version="2.0.100.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.http.jetty_2.0.100.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.http.jetty of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.http.jetty_2.0.100.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.http.jetty_2.0.100.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.http.jetty_2.0.0" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.http.jetty.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.http.jetty_2.0.100.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml b/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml
deleted file mode 100644
index 384c556..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.http.servlet/build.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.http.servlet" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.http.servlet"/>
-	<property name="bundleVersion" value="1.1.200.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.http.servlet for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.http.servlet_1.1.200.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.http.servlet @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.http.servlet.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.http.servlet_1.1.200.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.http.servlet_1.1.200.v20110502" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.1.200.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502" version="1.1.200.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.http.servlet_1.1.200.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.http.servlet of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.http.servlet_1.1.200.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.http.servlet_1.1.200.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.http.servlet" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.http.servlet.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.http.servlet_1.1.200.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.launcher/build.xml b/generatedScripts/plugins/org.eclipse.equinox.launcher/build.xml
deleted file mode 100644
index e62bc6a..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.launcher/build.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.launcher" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.launcher"/>
-	<property name="bundleVersion" value="1.2.0.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.2}"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.launcher_1.2.0.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.launcher for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.launcher_1.2.0.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.launcher @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.launcher.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.launcher_1.2.0.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.launcher_1.2.0.v20110502" log="${compilation.prereq.log}">
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.2.0.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="launcher.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502" version="1.2.0.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.launcher_1.2.0.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.launcher of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.launcher_1.2.0.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.launcher_1.2.0.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.launcher" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.launcher.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.launcher_1.2.0.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.artifact.repository/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.artifact.repository/build.xml
deleted file mode 100644
index 8c37805..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.artifact.repository/build.xml
+++ /dev/null
@@ -1,337 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.artifact.repository" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.artifact.repository"/>
-	<property name="bundleVersion" value="1.1.100.v20110505"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.artifact.repository for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.artifact.repository @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.artifact.repository.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.1.100.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" version="1.1.100.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.artifact.repository of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.artifact.repository.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml
deleted file mode 100644
index a7a050f..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.console/build.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.console" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.console"/>
-	<property name="bundleVersion" value="1.0.300.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.console for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.console @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.console.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.console_1.0.300.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.300.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" version="1.0.300.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.console of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.console" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.console.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.console_1.0.300.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.core/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.core/build.xml
deleted file mode 100644
index 83bd145..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.core/build.xml
+++ /dev/null
@@ -1,285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.core" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.core"/>
-	<property name="bundleVersion" value="2.1.0.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.core for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.core @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.core.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.core_2.1.0.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.1.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" version="2.1.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.core of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.core.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml
deleted file mode 100644
index 8f6025d..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.director.app/build.xml
+++ /dev/null
@@ -1,503 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.director.app" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.director.app"/>
-	<property name="bundleVersion" value="1.0.300.v20110505"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.director.app for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.director.app @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="ant_tasks/director-ant.jar.nestedJars">
-	</target>
-	<target name="ant_tasks/director-ant.jar" depends="init,ant_tasks/director-ant.jar.nestedJars" unless="ant_tasks/director-ant.jar" description="Create jar: org.eclipse.equinox.p2.director.app ant_tasks/director-ant.jar.">
-		<delete dir="${temp.folder}/ant_tasks/director-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/ant_tasks/director-ant.jar.bin"/>
-		<path id="ant_tasks/director-ant.jar.classpath">
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="bin/"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.director.app_1.0.300.v20110505/bin/"/>
-			<pathelement path="${build.result.folder}/@dot"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.director.app_1.0.300.v20110505/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-log4j.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-oro.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-regexp.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-resolver.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-xalan2.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-net.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jai.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-javamail.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jdepend.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jmf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jsch.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/ant_tasks/director-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="ant_tasks/director-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.ant_tasks_director-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/ant_tasks/director-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/ant_tasks/director-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<jar destfile="${build.result.folder}/ant_tasks/director-ant.jar" basedir="${temp.folder}/ant_tasks/director-ant.jar.bin"/>
-		<delete dir="${temp.folder}/ant_tasks/director-ant.jar.bin"/>
-	</target>
-
-	<target name="ant_tasks/director-antsrc.zip" depends="init" unless="ant_tasks/director-antsrc.zip">
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<antcall target="zip.ant_tasks/director-antsrc.zip"/>
-	</target>
-	<target name="zip.ant_tasks/director-antsrc.zip">
-		<zip destfile="${build.result.folder}/ant_tasks/director-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.ant_tasks/director-antsrc.zip">
-		<copy todir="${source.destination.folder}/ant_tasks/director-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.director.app.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<available property="ant_tasks/director-ant.jar" file="${build.result.folder}/ant_tasks/director-ant.jar"/>
-		<antcall target="ant_tasks/director-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.director.app_1.0.300.v20110505${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.director.app_1.0.300.v20110505" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<available property="ant_tasks/director-antsrc.zip" file="${build.result.folder}/ant_tasks/director-antsrc.zip"/>
-		<antcall target="ant_tasks/director-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.300.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/ant_tasks/director-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="ant_tasks/director-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="ant_tasks/director-ant.jar"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" version="1.0.300.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505/ant_tasks/director-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505/ant_tasks"/>
-		<copy file="${build.result.folder}/ant_tasks/director-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505/ant_tasks" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.ant_tasks/director-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505/ant_tasks"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505/ant_tasks" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/ant_tasks">
-				<include name="director-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.director.app of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${build.result.folder}/ant_tasks/director-ant.jar"/>
-		<delete file="${build.result.folder}/ant_tasks/director-antsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director.app" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.director.app.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml
deleted file mode 100644
index 73873d3..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.director/build.xml
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.director" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.director"/>
-	<property name="bundleVersion" value="2.1.0.v20110504-1715"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.director for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.director @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.director.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.director_2.1.0.v20110504-1715${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.1.0.v20110504-1715"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="OSGI-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" version="2.1.0.v20110504-1715"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.director of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.director.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.engine/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.engine/build.xml
deleted file mode 100644
index fa8150e..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.engine/build.xml
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.engine" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.engine"/>
-	<property name="bundleVersion" value="2.1.0.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.engine for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.engine_2.1.0.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.engine @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.engine.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.engine_2.1.0.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.engine_2.1.0.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.1.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="OSGI-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name=".options"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510" version="2.1.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.engine_2.1.0.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.engine of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.engine_2.1.0.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.engine_2.1.0.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.engine.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.engine_2.1.0.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml
deleted file mode 100644
index d293a07..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.garbagecollector/build.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.garbagecollector" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.garbagecollector"/>
-	<property name="bundleVersion" value="1.0.200.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.garbagecollector for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.garbagecollector @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.garbagecollector.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.200.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="schema/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/garbagecollector.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" version="1.0.200.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.garbagecollector of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.garbagecollector" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.garbagecollector.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.jarprocessor/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.jarprocessor/build.xml
deleted file mode 100644
index b30716e..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.jarprocessor/build.xml
+++ /dev/null
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.jarprocessor" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.jarprocessor"/>
-	<property name="bundleVersion" value="1.0.200.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.jarprocessor for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.jarprocessor @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="lib/jarprocessor-ant.jar.nestedJars">
-	</target>
-	<target name="lib/jarprocessor-ant.jar" depends="init,lib/jarprocessor-ant.jar.nestedJars" unless="lib/jarprocessor-ant.jar" description="Create jar: org.eclipse.equinox.p2.jarprocessor lib/jarprocessor-ant.jar.">
-		<delete dir="${temp.folder}/lib/jarprocessor-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/jarprocessor-ant.jar.bin"/>
-		<path id="lib/jarprocessor-ant.jar.classpath">
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="bin/"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/bin/"/>
-			<pathelement path="${build.result.folder}/@dot"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/lib/jarprocessor-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="lib/jarprocessor-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.lib_jarprocessor-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/lib/jarprocessor-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/lib/jarprocessor-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar destfile="${build.result.folder}/lib/jarprocessor-ant.jar" basedir="${temp.folder}/lib/jarprocessor-ant.jar.bin"/>
-		<delete dir="${temp.folder}/lib/jarprocessor-ant.jar.bin"/>
-	</target>
-
-	<target name="lib/jarprocessor-antsrc.zip" depends="init" unless="lib/jarprocessor-antsrc.zip">
-		<mkdir dir="${build.result.folder}/lib"/>
-		<antcall target="zip.lib/jarprocessor-antsrc.zip"/>
-	</target>
-	<target name="zip.lib/jarprocessor-antsrc.zip">
-		<zip destfile="${build.result.folder}/lib/jarprocessor-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.lib/jarprocessor-antsrc.zip">
-		<copy todir="${source.destination.folder}/lib/jarprocessor-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.jarprocessor.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<available property="lib/jarprocessor-ant.jar" file="${build.result.folder}/lib/jarprocessor-ant.jar"/>
-		<antcall target="lib/jarprocessor-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<available property="lib/jarprocessor-antsrc.zip" file="${build.result.folder}/lib/jarprocessor-antsrc.zip"/>
-		<antcall target="lib/jarprocessor-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.200.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/lib/jarprocessor-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="lib/jarprocessor-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="plugin.xml"/>
-				<include name="lib/jarprocessor-ant.jar"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" version="1.0.200.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/lib/jarprocessor-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/lib"/>
-		<copy file="${build.result.folder}/lib/jarprocessor-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/lib" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.lib/jarprocessor-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/lib"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/lib" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/lib">
-				<include name="jarprocessor-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.jarprocessor of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${build.result.folder}/lib/jarprocessor-ant.jar"/>
-		<delete file="${build.result.folder}/lib/jarprocessor-antsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.jarprocessor.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.metadata.repository/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.metadata.repository/build.xml
deleted file mode 100644
index 35b68f0..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.metadata.repository/build.xml
+++ /dev/null
@@ -1,442 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.metadata.repository" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.metadata.repository"/>
-	<property name="bundleVersion" value="1.2.0.v20110505"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.metadata.repository for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.metadata.repository @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="ant_tasks/metadataRepository-ant.jar.nestedJars">
-	</target>
-	<target name="ant_tasks/metadataRepository-ant.jar" depends="init,ant_tasks/metadataRepository-ant.jar.nestedJars" unless="ant_tasks/metadataRepository-ant.jar" description="Create jar: org.eclipse.equinox.p2.metadata.repository ant_tasks/metadataRepository-ant.jar.">
-		<delete dir="${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin"/>
-		<path id="ant_tasks/metadataRepository-ant.jar.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="bin/"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/bin/"/>
-			<pathelement path="${build.result.folder}/@dot"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="ant_tasks/metadataRepository-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.ant_tasks_metadataRepository-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<jar destfile="${build.result.folder}/ant_tasks/metadataRepository-ant.jar" basedir="${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin"/>
-		<delete dir="${temp.folder}/ant_tasks/metadataRepository-ant.jar.bin"/>
-	</target>
-
-	<target name="ant_tasks/metadataRepository-antsrc.zip" depends="init" unless="ant_tasks/metadataRepository-antsrc.zip">
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<antcall target="zip.ant_tasks/metadataRepository-antsrc.zip"/>
-	</target>
-	<target name="zip.ant_tasks/metadataRepository-antsrc.zip">
-		<zip destfile="${build.result.folder}/ant_tasks/metadataRepository-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.ant_tasks/metadataRepository-antsrc.zip">
-		<copy todir="${source.destination.folder}/ant_tasks/metadataRepository-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.metadata.repository.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<available property="ant_tasks/metadataRepository-ant.jar" file="${build.result.folder}/ant_tasks/metadataRepository-ant.jar"/>
-		<antcall target="ant_tasks/metadataRepository-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<available property="ant_tasks/metadataRepository-antsrc.zip" file="${build.result.folder}/ant_tasks/metadataRepository-antsrc.zip"/>
-		<antcall target="ant_tasks/metadataRepository-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.2.0.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/ant_tasks/metadataRepository-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="ant_tasks/metadataRepository-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="ant_tasks/metadataRepository-ant.jar"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" version="1.2.0.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/ant_tasks/metadataRepository-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/ant_tasks"/>
-		<copy file="${build.result.folder}/ant_tasks/metadataRepository-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/ant_tasks" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.ant_tasks/metadataRepository-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/ant_tasks"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/ant_tasks" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/ant_tasks">
-				<include name="metadataRepository-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.metadata.repository of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${build.result.folder}/ant_tasks/metadataRepository-ant.jar"/>
-		<delete file="${build.result.folder}/ant_tasks/metadataRepository-antsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.metadata.repository.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.metadata/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.metadata/build.xml
deleted file mode 100644
index 3f16dd2..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.metadata/build.xml
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.metadata" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.metadata"/>
-	<property name="bundleVersion" value="2.1.0.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.metadata for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.metadata @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.metadata.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.metadata_2.1.0.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.metadata_2.1.0.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.1.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510" version="2.1.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.metadata of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.metadata.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml
deleted file mode 100644
index 624b88d..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.publisher.eclipse/build.xml
+++ /dev/null
@@ -1,516 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.publisher.eclipse" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.publisher.eclipse"/>
-	<property name="bundleVersion" value="1.0.0.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.publisher.eclipse for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="pdepublishing.jar.nestedJars">
-	</target>
-	<target name="pdepublishing.jar" depends="init,pdepublishing.jar.nestedJars" unless="pdepublishing.jar" description="Create jar: org.eclipse.equinox.p2.publisher.eclipse pdepublishing.jar.">
-		<delete dir="${temp.folder}/pdepublishing.jar.bin"/>
-		<mkdir dir="${temp.folder}/pdepublishing.jar.bin"/>
-		<path id="pdepublishing.jar.classpath">
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/pdepublishing.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="pdepublishing.jar.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.pdepublishing.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/pdepublishing.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/pdepublishing.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}"/>
-		<jar destfile="${build.result.folder}/pdepublishing.jar" basedir="${temp.folder}/pdepublishing.jar.bin"/>
-		<delete dir="${temp.folder}/pdepublishing.jar.bin"/>
-	</target>
-
-	<target name="pdepublishingsrc.zip" depends="init" unless="pdepublishingsrc.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.pdepublishingsrc.zip"/>
-	</target>
-	<target name="zip.pdepublishingsrc.zip">
-		<zip destfile="${build.result.folder}/pdepublishingsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.pdepublishingsrc.zip">
-		<copy todir="${source.destination.folder}/pdepublishingsrc" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="ant_tasks/pdepublishing-ant.jar.nestedJars">
-	</target>
-	<target name="ant_tasks/pdepublishing-ant.jar" depends="init,ant_tasks/pdepublishing-ant.jar.nestedJars" unless="ant_tasks/pdepublishing-ant.jar" description="Create jar: org.eclipse.equinox.p2.publisher.eclipse ant_tasks/pdepublishing-ant.jar.">
-		<delete dir="${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin"/>
-		<path id="ant_tasks/pdepublishing-ant.jar.classpath">
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="bin/"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/bin/"/>
-			<pathelement path="${build.result.folder}/pdepublishing.jar"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/pdepublishing.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-log4j.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-oro.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-regexp.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-resolver.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-xalan2.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-net.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jai.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-javamail.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jdepend.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jmf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jsch.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="ant_tasks/pdepublishing-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.ant_tasks_pdepublishing-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<jar destfile="${build.result.folder}/ant_tasks/pdepublishing-ant.jar" basedir="${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin"/>
-		<delete dir="${temp.folder}/ant_tasks/pdepublishing-ant.jar.bin"/>
-	</target>
-
-	<target name="ant_tasks/pdepublishing-antsrc.zip" depends="init" unless="ant_tasks/pdepublishing-antsrc.zip">
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<antcall target="zip.ant_tasks/pdepublishing-antsrc.zip"/>
-	</target>
-	<target name="zip.ant_tasks/pdepublishing-antsrc.zip">
-		<zip destfile="${build.result.folder}/ant_tasks/pdepublishing-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.ant_tasks/pdepublishing-antsrc.zip">
-		<copy todir="${source.destination.folder}/ant_tasks/pdepublishing-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.publisher.eclipse.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="pdepublishing.jar" file="${build.result.folder}/pdepublishing.jar"/>
-		<antcall target="pdepublishing.jar"/>
-		<available property="ant_tasks/pdepublishing-ant.jar" file="${build.result.folder}/ant_tasks/pdepublishing-ant.jar"/>
-		<antcall target="ant_tasks/pdepublishing-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="pdepublishingsrc.zip" file="${build.result.folder}/pdepublishingsrc.zip"/>
-		<antcall target="pdepublishingsrc.zip"/>
-		<available property="ant_tasks/pdepublishing-antsrc.zip" file="${build.result.folder}/ant_tasks/pdepublishing-antsrc.zip"/>
-		<antcall target="ant_tasks/pdepublishing-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/pdepublishing.jar:${build.result.folder}/ant_tasks/pdepublishing-ant.jar"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="pdepublishing.jar"/>
-				<include name="ant_tasks/pdepublishing-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.properties"/>
-				<include name="ant_tasks/pdepublishing-ant.jar"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" version="1.0.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/pdepublishing.jar:${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/ant_tasks/pdepublishing-ant.jar"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/ant_tasks"/>
-		<copy file="${build.result.folder}/ant_tasks/pdepublishing-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/ant_tasks" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"/>
-		<copy file="${build.result.folder}/pdepublishingsrc.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.ant_tasks/pdepublishing-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.pdepublishingsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/ant_tasks"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/ant_tasks" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/ant_tasks">
-				<include name="pdepublishing-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}">
-				<include name="pdepublishing.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.publisher.eclipse of all the zips, jars and logs created.">
-		<delete file="${build.result.folder}/ant_tasks/pdepublishing-ant.jar"/>
-		<delete file="${build.result.folder}/ant_tasks/pdepublishing-antsrc.zip"/>
-		<delete file="${build.result.folder}/pdepublishing.jar"/>
-		<delete file="${build.result.folder}/pdepublishingsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher.eclipse" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.publisher.eclipse.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml
deleted file mode 100644
index 94ea7a2..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.publisher/build.xml
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.publisher" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.publisher"/>
-	<property name="bundleVersion" value="1.2.0.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.publisher for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.publisher @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.publisher.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.publisher_1.2.0.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.publisher_1.2.0.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.2.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="profiles/"/>
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510" version="1.2.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.publisher of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.publisher.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml
deleted file mode 100644
index 1942b9c..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.repository.tools/build.xml
+++ /dev/null
@@ -1,527 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.repository.tools" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.repository.tools"/>
-	<property name="bundleVersion" value="2.0.100.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.repository.tools for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.repository.tools @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/lib/jarprocessor-ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="lib/repository-tools-ant.jar.nestedJars">
-	</target>
-	<target name="lib/repository-tools-ant.jar" depends="init,lib/repository-tools-ant.jar.nestedJars" unless="lib/repository-tools-ant.jar" description="Create jar: org.eclipse.equinox.p2.repository.tools lib/repository-tools-ant.jar.">
-		<delete dir="${temp.folder}/lib/repository-tools-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/repository-tools-ant.jar.bin"/>
-		<path id="lib/repository-tools-ant.jar.classpath">
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="bin/"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/bin/"/>
-			<pathelement path="${build.result.folder}/@dot"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/lib/jarprocessor-ant.jar"/>
-			<pathelement path="../org.apache.ant/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/lib/repository-tools-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="lib/repository-tools-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.lib_repository-tools-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/lib/repository-tools-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/lib/repository-tools-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar destfile="${build.result.folder}/lib/repository-tools-ant.jar" basedir="${temp.folder}/lib/repository-tools-ant.jar.bin"/>
-		<delete dir="${temp.folder}/lib/repository-tools-ant.jar.bin"/>
-	</target>
-
-	<target name="lib/repository-tools-antsrc.zip" depends="init" unless="lib/repository-tools-antsrc.zip">
-		<mkdir dir="${build.result.folder}/lib"/>
-		<antcall target="zip.lib/repository-tools-antsrc.zip"/>
-	</target>
-	<target name="zip.lib/repository-tools-antsrc.zip">
-		<zip destfile="${build.result.folder}/lib/repository-tools-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.lib/repository-tools-antsrc.zip">
-		<copy todir="${source.destination.folder}/lib/repository-tools-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.repository.tools.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<available property="lib/repository-tools-ant.jar" file="${build.result.folder}/lib/repository-tools-ant.jar"/>
-		<antcall target="lib/repository-tools-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<available property="lib/repository-tools-antsrc.zip" file="${build.result.folder}/lib/repository-tools-antsrc.zip"/>
-		<antcall target="lib/repository-tools-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.0.100.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/lib/repository-tools-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="lib/repository-tools-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="lib/*.jar"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" version="2.0.100.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/lib/repository-tools-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/lib"/>
-		<copy file="${build.result.folder}/lib/repository-tools-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/lib" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.lib/repository-tools-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/lib"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/lib" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/lib">
-				<include name="repository-tools-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.repository.tools of all the zips, jars and logs created.">
-		<delete file="${build.result.folder}/lib/repository-tools-ant.jar"/>
-		<delete file="${build.result.folder}/lib/repository-tools-antsrc.zip"/>
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository.tools" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.repository.tools.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.repository/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.repository/build.xml
deleted file mode 100644
index 14a5ccc..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.repository/build.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.repository" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.repository"/>
-	<property name="bundleVersion" value="2.1.0.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.repository for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.repository_2.1.0.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.repository @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.repository.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.repository_2.1.0.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.repository_2.1.0.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.1.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/cacheManager.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510" version="2.1.0.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.repository_2.1.0.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.repository of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.repository_2.1.0.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.repository_2.1.0.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.repository.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.repository_2.1.0.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml
deleted file mode 100644
index 559a2c5..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.eclipse/build.xml
+++ /dev/null
@@ -1,390 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.touchpoint.eclipse" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.touchpoint.eclipse"/>
-	<property name="bundleVersion" value="2.1.0.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.touchpoint.eclipse for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.touchpoint.eclipse @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.garbagecollector/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.garbagecollector/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.touchpoint.eclipse.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.garbagecollector/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.garbagecollector_1.0.200.v20110510/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.1.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" version="2.1.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.touchpoint.eclipse of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.touchpoint.eclipse" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.touchpoint.eclipse.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.eclipse_2.1.0.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.natives/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.natives/build.xml
deleted file mode 100644
index fff2fd0..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.touchpoint.natives/build.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.touchpoint.natives" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.touchpoint.natives"/>
-	<property name="bundleVersion" value="1.0.300.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.touchpoint.natives for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.touchpoint.natives @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.touchpoint.natives.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.300.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" version="1.0.300.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.touchpoint.natives of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.touchpoint.natives" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.touchpoint.natives.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.touchpoint.natives_1.0.300.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml b/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml
deleted file mode 100644
index 2d49d09..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.p2.updatesite/build.xml
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.p2.updatesite" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.p2.updatesite"/>
-	<property name="bundleVersion" value="1.0.300.v20110510"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.p2.updatesite for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510.jar" basedir="${temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.p2.updatesite @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.p2.updatesite.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.p2.updatesite_1.0.300.v20110510${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.300.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" version="1.0.300.v20110510"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.p2.updatesite of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.updatesite" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.p2.updatesite.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.preferences/build.xml b/generatedScripts/plugins/org.eclipse.equinox.preferences/build.xml
deleted file mode 100644
index c4c9aeb..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.preferences/build.xml
+++ /dev/null
@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.preferences" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.preferences"/>
-	<property name="bundleVersion" value="3.4.0.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.preferences for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.preferences_3.4.0.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.preferences @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.preferences.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.preferences_3.4.0.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.preferences_3.4.0.v20110502" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.4.0.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name=".options"/>
-				<include name="about.html"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502" version="3.4.0.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.preferences_3.4.0.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.preferences of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.preferences_3.4.0.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.preferences_3.4.0.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.preferences.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.preferences_3.4.0.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.registry/build.xml b/generatedScripts/plugins/org.eclipse.equinox.registry/build.xml
deleted file mode 100644
index 9e8f3f7..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.registry/build.xml
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.registry" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.registry"/>
-	<property name="bundleVersion" value="3.5.100.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.registry for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.registry_3.5.100.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.registry @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="runtime_registry_compatibility.jar"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.equinox.registry_3.5.100.v20110502/runtime_registry_compatibility.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.registry.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.registry_3.5.100.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.registry_3.5.100.v20110502" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.registry_3.5.100.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.5.100.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name=".options"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="about_files/"/>
-				<include name="plugin.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502" version="3.5.100.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="about_files/"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.registry_3.5.100.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.registry of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.registry_3.5.100.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.registry_3.5.100.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.registry.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.registry_3.5.100.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.security/build.xml b/generatedScripts/plugins/org.eclipse.equinox.security/build.xml
deleted file mode 100644
index 4a5dbf8..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.security/build.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.security" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.security"/>
-	<property name="bundleVersion" value="1.1.0.v20110502"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.security for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.security_1.1.0.v20110502.jar" basedir="${temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.security @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.security.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.security_1.1.0.v20110502${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.security_1.1.0.v20110502" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.security_1.1.0.v20110502"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.1.0.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="META-INF/"/>
-				<include name="schema/"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name=".options"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502" version="1.1.0.v20110502"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="schema/"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.security_1.1.0.v20110502" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.security of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.security_1.1.0.v20110502.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.security_1.1.0.v20110502.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.security.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.security_1.1.0.v20110502.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/build.xml b/generatedScripts/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/build.xml
deleted file mode 100644
index d3eb03e..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/build.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.simpleconfigurator.manipulator" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.simpleconfigurator.manipulator"/>
-	<property name="bundleVersion" value="2.0.0.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.simpleconfigurator.manipulator for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.simpleconfigurator.manipulator @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.simpleconfigurator.manipulator.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="2.0.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" version="2.0.0.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.simpleconfigurator.manipulator of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator.manipulator" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.simpleconfigurator.manipulator.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.equinox.simpleconfigurator/build.xml b/generatedScripts/plugins/org.eclipse.equinox.simpleconfigurator/build.xml
deleted file mode 100644
index 1191fa4..0000000
--- a/generatedScripts/plugins/org.eclipse.equinox.simpleconfigurator/build.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.equinox.simpleconfigurator" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.equinox.simpleconfigurator"/>
-	<property name="bundleVersion" value="1.0.200.v20110502-1955"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.equinox.simpleconfigurator for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955.jar" basedir="${temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.equinox.simpleconfigurator @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.equinox.simpleconfigurator.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="1.0.200.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" version="1.0.200.v20110502-1955"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.equinox.simpleconfigurator of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.equinox.simpleconfigurator.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.help.base/build.xml b/generatedScripts/plugins/org.eclipse.help.base/build.xml
deleted file mode 100644
index b62ff3e..0000000
--- a/generatedScripts/plugins/org.eclipse.help.base/build.xml
+++ /dev/null
@@ -1,552 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.help.base" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.help.base"/>
-	<property name="bundleVersion" value="3.6.0.v20110506"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.help.base_3.6.0.v20110506"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.help.base for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110506.jar" basedir="${temp.folder}/org.eclipse.help.base_3.6.0.v20110506" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
-			<patternset includes="icu-data.jar"/>
-		</unzip>
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.help.base @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
-			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/bin/"/>
-			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.http.servlet/bin/"/>
-			<pathelement path="../org.eclipse.equinox.http.servlet/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-log4j.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-oro.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-regexp.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-resolver.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-xalan2.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-net.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jai.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-javamail.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jdepend.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jmf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jsch.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.apache.lucene"/>
-			<pathelement path="../org.apache.lucene/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/lucene.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/lucene-contrib/lucene-analyzers.jar"/>
-			<pathelement path="../org.eclipse.ant.core/@dot"/>
-			<pathelement path="../org.eclipse.core.variables/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.help/@dot"/>
-			<pathelement path="../org.eclipse.core.expressions/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<src path="src_demo/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="src_demo/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src_demo/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="src_demo/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="ant_tasks/helpbase-ant.jar.nestedJars">
-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
-			<patternset includes="icu-data.jar"/>
-		</unzip>
-	</target>
-	<target name="ant_tasks/helpbase-ant.jar" depends="init,ant_tasks/helpbase-ant.jar.nestedJars" unless="ant_tasks/helpbase-ant.jar" description="Create jar: org.eclipse.help.base ant_tasks/helpbase-ant.jar.">
-		<delete dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/>
-		<path id="ant_tasks/helpbase-ant.jar.classpath">
-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
-			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/bin/"/>
-			<pathelement path="../org.eclipse.equinox.http.jetty_2.0.0/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.http.servlet/bin/"/>
-			<pathelement path="../org.eclipse.equinox.http.servlet/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-util-6.1.26.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/jetty/lib/jetty-6.1.26.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-jsp-2.1-api.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-el-1.0.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/apache-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-antlr.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bcel.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-bsf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-log4j.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-oro.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-regexp.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-resolver.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-apache-xalan2.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-logging.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-commons-net.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jai.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-javamail.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jdepend.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jmf.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-jsch.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-junit4.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-launcher.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-netrexx.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-swing.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant-testutil.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.apache.lucene"/>
-			<pathelement path="../org.apache.lucene/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/lucene.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/lucene-contrib/lucene-analyzers.jar"/>
-			<pathelement path="../org.eclipse.ant.core/@dot"/>
-			<pathelement path="../org.eclipse.core.variables/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.help/@dot"/>
-			<pathelement path="../org.eclipse.core.expressions/@dot"/>
-			<pathelement path="${build.result.folder}/@dot"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.help.base_3.6.0.v20110506/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="ant_tasks/helpbase-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.ant_tasks_helpbase-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/ant_tasks/helpbase-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<jar destfile="${build.result.folder}/ant_tasks/helpbase-ant.jar" basedir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/>
-		<delete dir="${temp.folder}/ant_tasks/helpbase-ant.jar.bin"/>
-	</target>
-
-	<target name="ant_tasks/helpbase-antsrc.zip" depends="init" unless="ant_tasks/helpbase-antsrc.zip">
-		<mkdir dir="${build.result.folder}/ant_tasks"/>
-		<antcall target="zip.ant_tasks/helpbase-antsrc.zip"/>
-	</target>
-	<target name="zip.ant_tasks/helpbase-antsrc.zip">
-		<zip destfile="${build.result.folder}/ant_tasks/helpbase-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.ant_tasks/helpbase-antsrc.zip">
-		<copy todir="${source.destination.folder}/ant_tasks/helpbase-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.help.base.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<available property="ant_tasks/helpbase-ant.jar" file="${build.result.folder}/ant_tasks/helpbase-ant.jar"/>
-		<antcall target="ant_tasks/helpbase-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.help.base_3.6.0.v20110506${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.help.base_3.6.0.v20110506" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.http.jetty_2.0.0/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.http.jetty_2.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.expressions/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.expressions_3.4.300.v20110228/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.variables/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.variables_3.2.500.v20110509/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.http.servlet/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.http.servlet_1.1.200.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ant.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ant.core_3.2.300.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.help/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.help_3.5.100.v20110426/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.apache.lucene/compilation.problem"/>
-			<include name="${pluginTemp}/org.apache.lucene_2.9.1.201105111101/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<available property="ant_tasks/helpbase-antsrc.zip" file="${build.result.folder}/ant_tasks/helpbase-antsrc.zip"/>
-		<antcall target="ant_tasks/helpbase-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.help.base_3.6.0.v20110506"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.6.0.v20110506"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/ant_tasks/helpbase-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="ant_tasks/helpbase-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="doc/"/>
-				<include name="plugin.xml"/>
-				<include name="preferences.ini"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="about.ini"/>
-				<include name="about.mappings"/>
-				<include name="about.properties"/>
-				<include name="eclipse32.gif"/>
-				<include name="eclipse32.png"/>
-				<include name="META-INF/"/>
-				<include name="ant_tasks/helpbase-ant.jar"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506" version="3.6.0.v20110506"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506/ant_tasks/helpbase-ant.jar:${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506/ant_tasks"/>
-		<copy file="${build.result.folder}/ant_tasks/helpbase-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506/ant_tasks" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.ant_tasks/helpbase-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="schema/"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506/ant_tasks"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.help.base_3.6.0.v20110506/ant_tasks" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/ant_tasks">
-				<include name="helpbase-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.help.base of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${build.result.folder}/ant_tasks/helpbase-ant.jar"/>
-		<delete file="${build.result.folder}/ant_tasks/helpbase-antsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110506.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110506.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.help.base" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.help.base.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.help.base_3.6.0.v20110506.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.help/build.xml b/generatedScripts/plugins/org.eclipse.help/build.xml
deleted file mode 100644
index d1ede8b..0000000
--- a/generatedScripts/plugins/org.eclipse.help/build.xml
+++ /dev/null
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.help" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.help"/>
-	<property name="bundleVersion" value="3.5.100.v20110426"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.help_3.5.100.v20110426"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.help for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.help_3.5.100.v20110426.jar" basedir="${temp.folder}/org.eclipse.help_3.5.100.v20110426" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
-			<patternset includes="icu-data.jar"/>
-		</unzip>
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.help @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.core.expressions/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.help.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.help_3.5.100.v20110426${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.help_3.5.100.v20110426" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.expressions/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.expressions_3.4.300.v20110228/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.help_3.5.100.v20110426"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.5.100.v20110426"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="livehelp.js"/>
-				<include name="plugin.xml"/>
-				<include name="preferences.ini"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name=".options"/>
-				<include name="META-INF/"/>
-				<include name="command_link.png"/>
-				<include name="dtds/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426" version="3.5.100.v20110426"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="schema/"/>
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.help_3.5.100.v20110426" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.help of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.help_3.5.100.v20110426.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.help_3.5.100.v20110426.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.help" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.help.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.help_3.5.100.v20110426.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.osgi.services/build.xml b/generatedScripts/plugins/org.eclipse.osgi.services/build.xml
deleted file mode 100644
index 4a80a80..0000000
--- a/generatedScripts/plugins/org.eclipse.osgi.services/build.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.osgi.services" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.osgi.services"/>
-	<property name="bundleVersion" value="3.3.0.v20110411"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<available property="customBuildCallbacks" file="./customBuildCallbacks.xml" value="customBuildCallbacks.xml"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.2}"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.osgi.services for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110411.jar" basedir="${temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.osgi.services @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-		</path>
-		<subant antfile="${customBuildCallbacks}" target="pre. at dot" failonerror="false" buildpath=".">
-			<property name="source.folder1" value="."/>
-			<property name="target.folder" value="${build.result.folder}/@dot"/>
-			<reference refid="@dot.classpath"/>
-		</subant>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="."			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir=".">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<subant antfile="${customBuildCallbacks}" target="post.compile. at dot" failonerror="false" buildpath=".">
-			<property name="source.folder1" value="."/>
-			<property name="target.folder" value="${build.result.folder}/@dot"/>
-			<reference refid="@dot.classpath"/>
-		</subant>
-		<subant antfile="${customBuildCallbacks}" target="post. at dot" failonerror="false" buildpath=".">
-			<property name="jar.Location" value="${build.result.folder}/@dot"/>
-			<reference refid="@dot.classpath"/>
-		</subant>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir=".">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir=".">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.osgi.services.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<subant antfile="${customBuildCallbacks}" target="pre.build.jars" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<subant antfile="${customBuildCallbacks}" target="post.build.jars" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.osgi.services_3.3.0.v20110411${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.osgi.services_3.3.0.v20110411" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<subant antfile="${customBuildCallbacks}" target="pre.build.sources" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<subant antfile="${customBuildCallbacks}" target="post.build.sources" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-		<copy todir="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="META-INF/"/>
-				<include name="org/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411" version="3.3.0.v20110411"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   targetFolder="${build.result.folder}/org.eclipse.osgi.services_3.3.0.v20110411"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="META-INF/"/>
-				<include name="org/"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" version="3.3.0.v20110411"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}"/>
-		</subant>
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}"/>
-		</subant>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="src.zip"/>
-				<include name="about.html"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.logs" failonerror="false" buildpath=".">
-			<property name="destination.temp.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.logs" failonerror="false" buildpath=".">
-			<property name="destination.temp.folder" value="${destination.temp.folder}/org.eclipse.osgi.services_3.3.0.v20110411"/>
-		</subant>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.osgi.services of all the zips, jars and logs created.">
-		<subant antfile="${customBuildCallbacks}" target="pre.clean" failonerror="false" buildpath=".">
-			<property name="plugin.destination" value="${plugin.destination}"/>
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="temp.folder" value="${temp.folder}"/>
-		</subant>
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110411.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110411.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<subant antfile="${customBuildCallbacks}" target="post.clean" failonerror="false" buildpath=".">
-			<property name="plugin.destination" value="${plugin.destination}"/>
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="temp.folder" value="${temp.folder}"/>
-		</subant>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.osgi.services.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.osgi.services_3.3.0.v20110411.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.osgi/build.xml b/generatedScripts/plugins/org.eclipse.osgi/build.xml
deleted file mode 100644
index 5ab48c0..0000000
--- a/generatedScripts/plugins/org.eclipse.osgi/build.xml
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.osgi" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.osgi"/>
-	<property name="bundleVersion" value="3.7.0.v20110505"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<property name="bundleJavacSource" value="1.5"/>
-	<property name="bundleJavacTarget" value="jsr14"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.5}"	>
-		<isset property="J2SE-1.5"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${OSGi/Minimum-1.2}"	>
-		<isset property="OSGi/Minimum-1.2"/>
-	</condition>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.osgi for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.osgi_3.7.0.v20110505.jar" basedir="${temp.folder}/org.eclipse.osgi_3.7.0.v20110505" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.osgi @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="osgi/src"			/>
-			<src path="core/adaptor/"			/>
-			<src path="core/framework/"			/>
-			<src path="core/composite/"			/>
-			<src path="resolver/src/"			/>
-			<src path="defaultAdaptor/src/"			/>
-			<src path="eclipseAdaptor/src/"			/>
-			<src path="console/src/"			/>
-			<src path="supplement/src/"			/>
-			<src path="security/src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="osgi/src">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="core/adaptor/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="core/framework/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="core/composite/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="resolver/src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="defaultAdaptor/src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="eclipseAdaptor/src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="console/src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="supplement/src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="security/src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="osgi/src">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="core/adaptor/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="core/framework/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="core/composite/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="resolver/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="defaultAdaptor/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="eclipseAdaptor/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="console/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="supplement/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="security/src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="osgi/src">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="core/adaptor/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="core/framework/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="core/composite/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="resolver/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="defaultAdaptor/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="eclipseAdaptor/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="console/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="supplement/src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="security/src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.osgi.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.osgi_3.7.0.v20110505${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.osgi_3.7.0.v20110505" log="${compilation.prereq.log}">
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.osgi_3.7.0.v20110505"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.7.0.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name=".options"/>
-				<include name="about.html"/>
-				<include name="META-INF/"/>
-				<include name="systembundle.properties"/>
-				<include name="*.profile"/>
-				<include name="profile.list"/>
-				<include name="hookconfigurators.properties"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505" version="3.7.0.v20110505"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.osgi_3.7.0.v20110505" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.osgi of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.osgi_3.7.0.v20110505.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.osgi_3.7.0.v20110505.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.osgi.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.osgi_3.7.0.v20110505.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.pde.build/build.xml b/generatedScripts/plugins/org.eclipse.pde.build/build.xml
deleted file mode 100644
index c147d0a..0000000
--- a/generatedScripts/plugins/org.eclipse.pde.build/build.xml
+++ /dev/null
@@ -1,597 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.pde.build" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.pde.build"/>
-	<property name="bundleVersion" value="3.7.0.v20110509"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.pde.build_3.7.0.v20110509"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.pde.build for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110509.jar" basedir="${temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="pdebuild.jar.nestedJars">
-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
-			<patternset includes="icu-data.jar"/>
-		</unzip>
-	</target>
-	<target name="pdebuild.jar" depends="init,pdebuild.jar.nestedJars" unless="pdebuild.jar" description="Create jar: org.eclipse.pde.build pdebuild.jar.">
-		<delete dir="${temp.folder}/pdebuild.jar.bin"/>
-		<mkdir dir="${temp.folder}/pdebuild.jar.bin"/>
-		<path id="pdebuild.jar.classpath">
-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.updatesite/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.updatesite/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.ant.core/@dot"/>
-			<pathelement path="../org.eclipse.core.variables/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility/@dot"/>
-			<pathelement path="../org.eclipse.update.configurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository.tools/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository.tools/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.director.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director.app/@dot"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository.tools/lib/repository-tools-ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/pdebuild.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="pdebuild.jar.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.pdebuild.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/pdebuild.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/pdebuild.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}"/>
-		<jar destfile="${build.result.folder}/pdebuild.jar" basedir="${temp.folder}/pdebuild.jar.bin"/>
-		<delete dir="${temp.folder}/pdebuild.jar.bin"/>
-	</target>
-
-	<target name="pdebuildsrc.zip" depends="init" unless="pdebuildsrc.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.pdebuildsrc.zip"/>
-	</target>
-	<target name="zip.pdebuildsrc.zip">
-		<zip destfile="${build.result.folder}/pdebuildsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.pdebuildsrc.zip">
-		<copy todir="${source.destination.folder}/pdebuildsrc" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="lib/pdebuild-ant.jar.nestedJars">
-		<mkdir dir="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208"/>
-		<unzip src="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar" dest="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208" overwrite="false">
-			<patternset includes="icu-data.jar"/>
-		</unzip>
-	</target>
-	<target name="lib/pdebuild-ant.jar" depends="init,lib/pdebuild-ant.jar.nestedJars" unless="lib/pdebuild-ant.jar" description="Create jar: org.eclipse.pde.build lib/pdebuild-ant.jar.">
-		<delete dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/>
-		<mkdir dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/>
-		<path id="lib/pdebuild-ant.jar.classpath">
-			<pathelement path="${buildDirectory}/nestedJars/com.ibm.icu_4.4.2.v20110208/icu-data.jar"/>
-			<pathelement path="../../../../../../../../../usr/lib/eclipse/plugins/com.ibm.icu_4.4.2.v20110208.jar"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin/@dot"/>
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.core/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.engine/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.metadata.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator.manipulator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/bin/"/>
-			<pathelement path="../org.eclipse.equinox.frameworkadmin.equinox/@dot"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/bin/"/>
-			<pathelement path="../org.eclipse.equinox.simpleconfigurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.updatesite/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.updatesite/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.artifact.repository/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.jarprocessor/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher.eclipse/pdepublishing.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.publisher/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.ant.core/@dot"/>
-			<pathelement path="../org.eclipse.core.variables/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility/@dot"/>
-			<pathelement path="../org.eclipse.update.configurator/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository.tools/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository.tools/@dot"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.core.jar"/>
-			<pathelement path="../../../../../../../../../usr/share/java/org.sat4j.pb.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.director.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.p2.director.app/@dot"/>
-			<pathelement path="bin/"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110509/bin/"/>
-			<pathelement path="${build.result.folder}/pdebuild.jar"/>
-			<pathelement path="${build.result.folder}/../org.eclipse.pde.build_3.7.0.v20110509/pdebuild.jar"/>
-			<pathelement path="../org.apache.ant_1.8.2.v20110505-1300/lib/ant.jar"/>
-			<pathelement path="../org.eclipse.equinox.p2.repository.tools/lib/repository-tools-ant.jar"/>
-			<pathelement path="../org.apache.ant/ant.jar"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${temp.folder}/lib/pdebuild-ant.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="lib/pdebuild-ant.jar.classpath" />
-			<src path="src_ant/"			/>
-			<compilerarg value="@${basedir}/javaCompiler.lib_pdebuild-ant.jar.args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${temp.folder}/lib/pdebuild-ant.jar.bin${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${temp.folder}/lib/pdebuild-ant.jar.bin" failonerror="true" overwrite="false">
-			<fileset dir="src_ant/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${build.result.folder}/lib"/>
-		<jar destfile="${build.result.folder}/lib/pdebuild-ant.jar" basedir="${temp.folder}/lib/pdebuild-ant.jar.bin"/>
-		<delete dir="${temp.folder}/lib/pdebuild-ant.jar.bin"/>
-	</target>
-
-	<target name="lib/pdebuild-antsrc.zip" depends="init" unless="lib/pdebuild-antsrc.zip">
-		<mkdir dir="${build.result.folder}/lib"/>
-		<antcall target="zip.lib/pdebuild-antsrc.zip"/>
-	</target>
-	<target name="zip.lib/pdebuild-antsrc.zip">
-		<zip destfile="${build.result.folder}/lib/pdebuild-antsrc.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.lib/pdebuild-antsrc.zip">
-		<copy todir="${source.destination.folder}/lib/pdebuild-antsrc" failonerror="true" overwrite="true">
-			<fileset dir="src_ant/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.pde.build.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="pdebuild.jar" file="${build.result.folder}/pdebuild.jar"/>
-		<antcall target="pdebuild.jar"/>
-		<available property="lib/pdebuild-ant.jar" file="${build.result.folder}/lib/pdebuild-ant.jar"/>
-		<antcall target="lib/pdebuild-ant.jar"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.pde.build_3.7.0.v20110509${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.pde.build_3.7.0.v20110509" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.core_2.1.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.director.app_1.0.300.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.variables/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.variables_3.2.500.v20110509/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.updatesite/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.updatesite_1.0.300.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.director/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.director_2.1.0.v20110504-1715/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.update.configurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.update.configurator_3.3.100.v20100512/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher.eclipse/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher.eclipse_1.0.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator.manipulator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator.manipulator_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.publisher/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.publisher_1.2.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.ant.core/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.ant.core_3.2.300.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin_2.0.0.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.metadata.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.metadata.repository_1.2.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository.tools/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository.tools_2.0.100.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.repository_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility_3.2.100.v20100505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.artifact.repository/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.artifact.repository_1.1.100.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.frameworkadmin.equinox/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.frameworkadmin.equinox_1.0.300.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.simpleconfigurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.simpleconfigurator_1.0.200.v20110502-1955/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.engine/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.engine_2.1.0.v20110510/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.p2.jarprocessor/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.p2.jarprocessor_1.0.200.v20110502-1955/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="pdebuildsrc.zip" file="${build.result.folder}/pdebuildsrc.zip"/>
-		<antcall target="pdebuildsrc.zip"/>
-		<available property="lib/pdebuild-antsrc.zip" file="${build.result.folder}/lib/pdebuild-antsrc.zip"/>
-		<antcall target="lib/pdebuild-antsrc.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.pde.build_3.7.0.v20110509"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.7.0.v20110509"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/pdebuild.jar:${build.result.folder}/lib/pdebuild-ant.jar"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="pdebuild.jar"/>
-				<include name="lib/pdebuild-ant.jar"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name="*.jar"/>
-				<include name="lib/*.jar"/>
-				<include name="scripts/"/>
-				<include name="templates/"/>
-				<include name="data/"/>
-				<include name="META-INF/"/>
-				<include name=".options"/>
-				<include name="about_files/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" version="3.7.0.v20110509"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509/pdebuild.jar:${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509/lib/pdebuild-ant.jar"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509"/>
-		<copy file="${build.result.folder}/pdebuildsrc.zip" todir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" failonerror="false" overwrite="false"/>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509/lib"/>
-		<copy file="${build.result.folder}/lib/pdebuild-antsrc.zip" todir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509/lib" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.pdebuildsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.lib/pdebuild-antsrc.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}">
-				<include name="pdebuild.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509/lib"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.pde.build_3.7.0.v20110509/lib" failonerror="false" overwrite="false">
-			<fileset dir="${temp.folder}/lib">
-				<include name="pdebuild-ant.jar.bin${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.pde.build of all the zips, jars and logs created.">
-		<delete file="${build.result.folder}/pdebuild.jar"/>
-		<delete file="${build.result.folder}/pdebuildsrc.zip"/>
-		<delete file="${build.result.folder}/lib/pdebuild-ant.jar"/>
-		<delete file="${build.result.folder}/lib/pdebuild-antsrc.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110509.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110509.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.pde.build" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.pde.build.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.pde.build_3.7.0.v20110509.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.update.configurator/build.xml b/generatedScripts/plugins/org.eclipse.update.configurator/build.xml
deleted file mode 100644
index b98625f..0000000
--- a/generatedScripts/plugins/org.eclipse.update.configurator/build.xml
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.update.configurator" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.update.configurator"/>
-	<property name="bundleVersion" value="3.3.100.v20100512"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.0/Foundation-1.0}"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="CDC-1.0/Foundation-1.0"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${J2SE-1.3}"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.1"	>
-		<isset property="J2SE-1.3"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.update.configurator_3.3.100.v20100512"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.update.configurator for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.update.configurator_3.3.100.v20100512.jar" basedir="${temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.update.configurator @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-		</path>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.update.configurator.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.update.configurator_3.3.100.v20100512${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.update.configurator_3.3.100.v20100512" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.update.configurator_3.3.100.v20100512"/>
-		<copy todir="${build.result.folder}" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="META-INF/MANIFEST.MF"/>
-				<include name="plugin.xml"/>
-				<include name="fragment.xml"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}" version="3.3.100.v20100512"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   baseDirectory="${basedir}"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name=".options"/>
-				<include name="about.html"/>
-				<include name="plugin.properties"/>
-				<include name="META-INF/"/>
-				<include name="OSGI-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512" version="3.3.100.v20100512"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512"/>
-		</antcall>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.update.configurator_3.3.100.v20100512" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.update.configurator of all the zips, jars and logs created.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.update.configurator_3.3.100.v20100512.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.update.configurator_3.3.100.v20100512.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.update.configurator" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.update.configurator.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.update.configurator_3.3.100.v20100512.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/generatedScripts/plugins/org.eclipse.update.core/build.xml b/generatedScripts/plugins/org.eclipse.update.core/build.xml
deleted file mode 100644
index a10ff09..0000000
--- a/generatedScripts/plugins/org.eclipse.update.core/build.xml
+++ /dev/null
@@ -1,463 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.update.core" default="build.jars" basedir=".">
-
-	<property name="p2.build.repo" value="file:${buildDirectory}/buildRepo"/>
-	<property name="basews" value="${ws}"/>
-	<property name="baseos" value="${os}"/>
-	<property name="basearch" value="${arch}"/>
-	<property name="basenl" value="${nl}"/>
-	<property name="bundleId" value="org.eclipse.update.core"/>
-	<property name="bundleVersion" value="3.2.500.v20110330"/>
-	<property name="p2.publishonerror" value="false"/>
-
-	<available property="customBuildCallbacks" file="./customBuildCallbacks.xml" value="customBuildCallbacks.xml"/>
-
-	<!-- Compiler settings. -->
-	<property name="javacFailOnError" value="false"/>
-	<property name="javacDebugInfo" value="on"/>
-	<property name="javacVerbose" value="false"/>
-	<property name="logExtension" value=".log"/>
-	<property name="compilerArg" value=""/>
-	<property name="compilation.prereq.log" value="${buildDirectory}/prereqErrors.log"/>
-	<property name="javacSource" value="1.3"/>
-	<property name="javacTarget" value="1.2"/>
-	<condition property="dir_bootclasspath" value="${java.home}/../Classes">
-		<os family="mac"/>
-	</condition>
-	<property name="dir_bootclasspath" value="${java.home}/lib"/>
-	<path id="path_bootclasspath">
-		<fileset dir="${dir_bootclasspath}">
-			<include name="*.jar"/>
-		</fileset>
-	</path>
-	<property name="bootclasspath" refid="path_bootclasspath"/>
-	<condition property="bundleBootClasspath" value="${J2SE-1.4}"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="J2SE-1.4"/>
-	</condition>
-	<condition property="bundleBootClasspath" value="${CDC-1.1/Foundation-1.1}"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacSource" value="1.3"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<condition property="bundleJavacTarget" value="1.2"	>
-		<isset property="CDC-1.1/Foundation-1.1"/>
-	</condition>
-	<property name="bundleJavacSource" value="${javacSource}"/>
-	<property name="bundleJavacTarget" value="${javacTarget}"/>
-	<property name="bundleBootClasspath" value="${bootclasspath}"/>
-
-	<target name="init" depends="properties">
-		<condition property="pluginTemp" value="${buildTempFolder}/plugins"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="pluginTemp" value="${basedir}"/>
-		<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.update.core_3.2.500.v20110330"		>
-			<isset property="buildTempFolder"/>
-		</condition>
-		<property name="build.result.folder" value="${basedir}"/>
-		<property name="temp.folder" value="${basedir}/temp.folder"/>
-		<property name="plugin.destination" value="${basedir}"/>
-		<condition property="p2.publish.parts" value="true"		>
-			<istrue value="${p2.gathering}"/>
-		</condition>
-		<property name="compilation.problem.marker" value="${build.result.folder}/compilation.problem"/>
-		<condition property="compilation.problem.marker.exists" value="true"		>
-			<and>
-			<available file="${compilation.problem.marker}"/>
-			<isfalse value="${p2.publishonerror}"/>
-			</and>
-		</condition>
-	</target>
-
-	<target name="properties" if="eclipse.running">
-		<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
-
-	</target>
-
-	<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.update.core for an update site.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<jar destfile="${plugin.destination}/org.eclipse.update.core_3.2.500.v20110330.jar" basedir="${temp.folder}/org.eclipse.update.core_3.2.500.v20110330" filesetmanifest="merge"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="@dot.nestedJars">
-	</target>
-	<target name="@dot" depends="init, at dot.nestedJars" unless="@dot" description="Create jar: org.eclipse.update.core @dot.">
-		<delete dir="${build.result.folder}/@dot"/>
-		<mkdir dir="${build.result.folder}/@dot"/>
-		<path id="@dot.classpath">
-			<pathelement path="../org.eclipse.osgi/bin/"/>
-			<pathelement path="../org.eclipse.osgi/@dot"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.transforms.hook/@dot"/>
-			<pathelement path="../org.eclipse.equinox.servletbridge.extensionbundle/@dot"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/bin/"/>
-			<pathelement path="../org.eclipse.equinox.weaving.hook/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime/@dot"/>
-			<pathelement path="../org.eclipse.equinox.common/bin/"/>
-			<pathelement path="../org.eclipse.equinox.common/@dot"/>
-			<pathelement path="../org.eclipse.core.jobs/bin/"/>
-			<pathelement path="../org.eclipse.core.jobs/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/runtime_registry_compatibility.jar"/>
-			<pathelement path="../org.eclipse.equinox.registry/bin/"/>
-			<pathelement path="../org.eclipse.equinox.registry/@dot"/>
-			<pathelement path="../org.eclipse.equinox.preferences/bin/"/>
-			<pathelement path="../org.eclipse.equinox.preferences/@dot"/>
-			<pathelement path="../org.eclipse.core.contenttype/bin/"/>
-			<pathelement path="../org.eclipse.core.contenttype/@dot"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/bin/"/>
-			<pathelement path="../org.eclipse.core.runtime.compatibility.auth/@dot"/>
-			<pathelement path="../org.eclipse.equinox.app/bin/"/>
-			<pathelement path="../org.eclipse.equinox.app/@dot"/>
-			<pathelement path="../org.eclipse.osgi.services"/>
-			<pathelement path="../org.eclipse.osgi.services/@dot"/>
-			<pathelement path="../../../../../../../../../usr/share/java/tomcat6-servlet-2.5-api.jar"/>
-			<pathelement path="../org.eclipse.update.configurator/@dot"/>
-			<pathelement path="../org.eclipse.core.net/bin/"/>
-			<pathelement path="../org.eclipse.core.net/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.linux.x86/@dot"/>
-			<pathelement path="../org.eclipse.core.net.win32.x86_64/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.macosx/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86/@dot"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/bin/"/>
-			<pathelement path="../org.eclipse.equinox.security.win32.x86_64/@dot"/>
-		</path>
-		<subant antfile="${customBuildCallbacks}" target="pre. at dot" failonerror="false" buildpath=".">
-			<property name="source.folder1" value="src/"/>
-			<property name="source.folder2" value="jarprocessor/"/>
-			<property name="target.folder" value="${build.result.folder}/@dot"/>
-			<reference refid="@dot.classpath"/>
-		</subant>
-		<!-- compile the source code -->
-		<javac destdir="${build.result.folder}/@dot" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}" errorProperty="compilation.error.occured"		>
-			<compilerarg line="${compilerArg}" compiler="${build.compiler}"/>
-			<classpath refid="@dot.classpath" />
-			<src path="src/"			/>
-			<src path="jarprocessor/"			/>
-			<compilerarg value="@${basedir}/javaCompiler...args" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-			<compilerarg line="-log '${build.result.folder}/@dot${logExtension}'" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"			/>
-		</javac>
-		<antcall target="checkCompilationResults"/>
-		<!-- Copy necessary resources -->
-		<copy todir="${build.result.folder}/@dot" failonerror="true" overwrite="false">
-			<fileset dir="src/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-			<fileset dir="jarprocessor/">
-				<exclude name="**/*.java"/>
-				<exclude name="**/package.htm*"/>
-			</fileset>
-		</copy>
-		<subant antfile="${customBuildCallbacks}" target="post.compile. at dot" failonerror="false" buildpath=".">
-			<property name="source.folder1" value="src/"/>
-			<property name="source.folder2" value="jarprocessor/"/>
-			<property name="target.folder" value="${build.result.folder}/@dot"/>
-			<reference refid="@dot.classpath"/>
-		</subant>
-		<subant antfile="${customBuildCallbacks}" target="post. at dot" failonerror="false" buildpath=".">
-			<property name="jar.Location" value="${build.result.folder}/@dot"/>
-			<reference refid="@dot.classpath"/>
-		</subant>
-	</target>
-
-	<target name="src.zip" depends="init" unless="src.zip">
-		<mkdir dir="${build.result.folder}"/>
-		<antcall target="zip.src.zip"/>
-	</target>
-	<target name="zip.src.zip">
-		<zip destfile="${build.result.folder}/src.zip" filesonly="false" whenempty="skip" update="false">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="jarprocessor/">
-				<include name="**/*.java"/>
-			</fileset>
-		</zip>
-	</target>
-	<target name="copy.src.zip">
-		<copy todir="${source.destination.folder}/" failonerror="true" overwrite="true">
-			<fileset dir="src/">
-				<include name="**/*.java"/>
-			</fileset>
-			<fileset dir="jarprocessor/">
-				<include name="**/*.java"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="build.jars" depends="init" description="Compile classes and build nested jars for the plug-in: org.eclipse.update.core.">
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<subant antfile="${customBuildCallbacks}" target="pre.build.jars" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-		<available property="@dot" file="${build.result.folder}/@dot"/>
-		<antcall target="@dot"/>
-		<subant antfile="${customBuildCallbacks}" target="post.build.jars" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-	</target>
-
-	<target name="checkCompilationResults" if="compilation.error.occured">
-		<echo file="${compilation.problem.marker}" message="org.eclipse.update.core_3.2.500.v20110330${line.separator}compilation.error.occured=${compilation.error.occured}"/>
-		<eclipse.logCompileError bundle="org.eclipse.update.core_3.2.500.v20110330" log="${compilation.prereq.log}">
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.preferences/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.preferences_3.4.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_64_1.1.0.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.registry_3.5.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security_1.1.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.app/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.app_1.3.100.v20110321/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.update.configurator/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.update.configurator_3.3.100.v20100512/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.linux.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.linux.x86_1.1.200.I20110419-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.transforms.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.transforms.hook_1.0.300.v20100719/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_64_1.0.0.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.contenttype/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.contenttype_3.4.100.v20110423-0524/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.servletbridge.extensionbundle/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.servletbridge.extensionbundle_1.2.0.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net.win32.x86_64/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net.win32.x86_64_1.0.100.I20110331-0827/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.auth/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.auth_3.2.200.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.common/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.common_3.6.0.v20110506/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.macosx/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.macosx_1.100.100.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime_3.7.0.v20110110/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.weaving.hook/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.weaving.hook_1.0.100.v20110502/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.equinox.security.win32.x86/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.equinox.security.win32.x86_1.0.200.v20100503/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.jobs/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.jobs_3.5.100.v20110404/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi_3.7.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.net/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.net_1.2.100.I20110510-0800/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.core.runtime.compatibility.registry/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.core.runtime.compatibility.registry_3.5.0.v20110505/compilation.problem"/>
-			<include name="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.osgi.services/compilation.problem"/>
-			<include name="${pluginTemp}/org.eclipse.osgi.services_3.3.0.v20110411/compilation.problem"/>
-		</eclipse.logCompileError>
-	</target>
-
-	<target name="build.sources" depends="init">
-		<subant antfile="${customBuildCallbacks}" target="pre.build.sources" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-		<available property="src.zip" file="${build.result.folder}/src.zip"/>
-		<antcall target="src.zip"/>
-		<subant antfile="${customBuildCallbacks}" target="post.build.sources" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-		</subant>
-	</target>
-
-	<target name="publish.bin.parts" depends="init" if="p2.publish.parts" unless="compilation.problem.marker.exists">
-		<mkdir dir="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-		<copy todir="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name=".options"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330" version="3.2.500.v20110330"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-		<eclipse.gatherBundle 
-		   metadataRepository="${p2.build.repo}"
-		   artifactRepository="${p2.build.repo}"
-		   buildResultFolder="${build.result.folder}"
-		   targetFolder="${build.result.folder}/org.eclipse.update.core_3.2.500.v20110330"
-		/>
-	</target>
-
-	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
-		<mkdir dir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-		<copy todir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330" failonerror="true" overwrite="false">
-			<fileset dir="${build.result.folder}/@dot">
-				<include name="**"/>
-			</fileset>
-		</copy>
-		<copy todir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330" failonerror="true" overwrite="true">
-			<fileset dir="${basedir}">
-				<include name="plugin.xml"/>
-				<include name="plugin.properties"/>
-				<include name="about.html"/>
-				<include name=".options"/>
-				<include name="META-INF/"/>
-			</fileset>
-		</copy>
-		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330" version="3.2.500.v20110330"/>
-		<antcall target="apitools.generation">
-			<param name="target.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-			<param name="projectLocation" value="${basedir}"/>
-			<param name="binary.folders" value="${build.result.folder}/@dot"/>
-			<param name="projectName" value="${bundleId}_${bundleVersion}"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.bin.parts" failonerror="false" buildpath=".">
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-	</target>
-
-	<target name="build.zips" depends="init">
-	</target>
-
-	<target name="gather.sources" depends="init" if="destination.temp.folder">
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		<copy file="${build.result.folder}/src.zip" todir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330" failonerror="false" overwrite="false"/>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-	</target>
-
-	<target name="gather.individual.sources" depends="init">
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}"/>
-		</subant>
-		<antcall target="copy.src.zip">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<antcall target="copy.src.includes">
-			<param name="source.destination.folder" value="${destination.temp.folder}"/>
-		</antcall>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.sources" failonerror="false" buildpath=".">
-			<property name="target.folder" value="${destination.temp.folder}"/>
-		</subant>
-	</target>
-
-	<target name="copy.src.includes" depends="init">
-		<copy todir="${source.destination.folder}" failonerror="false" overwrite="false">
-			<fileset dir="${basedir}">
-				<include name="about.html"/>
-				<include name="schema/"/>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="gather.logs" depends="init" if="destination.temp.folder">
-		<subant antfile="${customBuildCallbacks}" target="pre.gather.logs" failonerror="false" buildpath=".">
-			<property name="destination.temp.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-		<mkdir dir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		<copy todir="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330" failonerror="false" overwrite="false">
-			<fileset dir="${build.result.folder}">
-				<include name="@dot${logExtension}"/>
-			</fileset>
-		</copy>
-		<subant antfile="${customBuildCallbacks}" target="post.gather.logs" failonerror="false" buildpath=".">
-			<property name="destination.temp.folder" value="${destination.temp.folder}/org.eclipse.update.core_3.2.500.v20110330"/>
-		</subant>
-	</target>
-
-	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.update.core of all the zips, jars and logs created.">
-		<subant antfile="${customBuildCallbacks}" target="pre.clean" failonerror="false" buildpath=".">
-			<property name="plugin.destination" value="${plugin.destination}"/>
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="temp.folder" value="${temp.folder}"/>
-		</subant>
-		<delete dir="${build.result.folder}/@dot"/>
-		<delete file="${build.result.folder}/src.zip"/>
-		<delete file="${plugin.destination}/org.eclipse.update.core_3.2.500.v20110330.jar"/>
-		<delete file="${plugin.destination}/org.eclipse.update.core_3.2.500.v20110330.zip"/>
-		<delete dir="${temp.folder}"/>
-		<delete file="${compilation.problem.marker}" quiet="true"/>
-		<subant antfile="${customBuildCallbacks}" target="post.clean" failonerror="false" buildpath=".">
-			<property name="plugin.destination" value="${plugin.destination}"/>
-			<property name="build.result.folder" value="${build.result.folder}"/>
-			<property name="temp.folder" value="${temp.folder}"/>
-		</subant>
-	</target>
-
-	<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-		<eclipse.convertPath fileSystemPath="/home/zx/eclipse/org.eclipse.linuxtools.eclipse-build/eclipse-build/build/eclipse-3.7.0-I20110510-0800-src/plugins/org.eclipse.update.core" property="resourcePath"/>
-		<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
-	</target>
-
-	<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.update.core.">
-		<delete dir="${temp.folder}"/>
-		<mkdir dir="${temp.folder}"/>
-		<antcall target="build.jars"/>
-		<antcall target="build.sources"/>
-		<antcall target="gather.bin.parts">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<antcall target="gather.sources">
-			<param name="destination.temp.folder" value="${temp.folder}/"/>
-		</antcall>
-		<delete>
-			<fileset dir="${temp.folder}">
-				<include name="**/*.bin${logExtension}"/>
-			</fileset>
-		</delete>
-		<zip destfile="${plugin.destination}/org.eclipse.update.core_3.2.500.v20110330.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-		<delete dir="${temp.folder}"/>
-	</target>
-
-	<target name="apitools.generation" if="generateAPIDescription">
-		<apitooling.apigeneration  projectName="${projectName}" project="${projectLocation}" binary="${binary.folders}" target="${target.folder}" extramanifests="${extraManifests}" allownonapiproject="${allowNonApiProject}"		/>
-	</target>
-
-</project>
diff --git a/pdebuild.xml b/pdebuild.xml
index b192d2c..d8a8d2c 100644
--- a/pdebuild.xml
+++ b/pdebuild.xml
@@ -1,7 +1,7 @@
 <project name="Pdebuild bootstrap" default="cleanBuild" basedir=".">
 	<property file="pdebuild.properties" />
 	<property name="sdkSource" value="build/eclipse-${label}-src" />
-	<target name="cleanBuild" depends="clean,zipPlugins2" />
+	<target name="cleanBuild" depends="clean,removeGeneratedBuildXMLs" />
 	<macrodef name="generateBuildScripts">
 		<attribute name="buildDirs" />
 		<attribute name="rootDir" />
@@ -22,89 +22,92 @@
 
 
 	<!-- Order in this filelist is critical for building !!! -->
-	<filelist id="depsDirs" dir="${sdkSource}/plugins">
-		<file name="org.eclipse.osgi" />
-		<file name="org.eclipse.equinox.common" />
-		<file name="org.eclipse.core.jobs" />
-		<file name="org.eclipse.equinox.registry" />
-		<file name="org.eclipse.equinox.preferences" />
-		<file name="org.eclipse.core.runtime.compatibility.auth" />
-		<file name="org.eclipse.core.contenttype" />
-		<file name="org.eclipse.equinox.app" />
-		<file name="org.eclipse.core.runtime" />
-		<file name="org.eclipse.core.variables" />
-		<file name="org.eclipse.ant.core" />
-		<file name="org.eclipse.equinox.p2.core" />
-		<file name="org.eclipse.equinox.p2.metadata" />
-		<file name="org.eclipse.equinox.frameworkadmin" />
-		<file name="org.eclipse.equinox.frameworkadmin.equinox" />
-		<file name="org.eclipse.equinox.p2.jarprocessor" />
-		<file name="org.eclipse.equinox.security" />
-		<file name="org.eclipse.core.net" />
-		<file name="org.eclipse.equinox.concurrent" />
-		<file name="org.eclipse.ecf.ssl" />
-		<file name="org.eclipse.ecf.identity" />
-		<file name="org.eclipse.ecf" />
-		<file name="org.eclipse.ecf.filetransfer" />
-		<file name="org.eclipse.ecf.provider.filetransfer" />
-		<file name="org.eclipse.ecf.provider.filetransfer.ssl" />
-		<file name="org.eclipse.ecf.provider.filetransfer.httpclient" />
-		<file name="org.eclipse.ecf.provider.filetransfer.httpclient.ssl" />
-		<file name="org.eclipse.equinox.p2.repository" />
-		<file name="org.eclipse.equinox.p2.artifact.repository" />
-		<file name="org.eclipse.equinox.p2.metadata.repository" />
-		<file name="org.eclipse.equinox.simpleconfigurator" />
-		<file name="org.eclipse.equinox.simpleconfigurator.manipulator" />
-		<file name="org.eclipse.equinox.p2.publisher" />
-		<file name="org.eclipse.update.configurator" />
-		<file name="org.eclipse.core.runtime.compatibility" />
-		<file name="org.eclipse.equinox.p2.engine" />
-		<file name="org.eclipse.equinox.p2.director" />
-		<file name="org.eclipse.equinox.p2.publisher.eclipse" />
-		<file name="org.eclipse.equinox.p2.repository.tools" />
-		<file name="org.eclipse.equinox.p2.updatesite" />
-		<file name="org.eclipse.pde.build" />
-		<file name="org.eclipse.equinox.launcher" />
-		<file name="org.eclipse.osgi.services" />
-		<file name="org.eclipse.equinox.p2.console" />
-		<file name="org.eclipse.equinox.p2.director.app" />
-		<file name="org.eclipse.update.core" />
-		<file name="org.eclipse.equinox.p2.garbagecollector" />
-		<file name="org.eclipse.core.expressions" />
-		<file name="org.eclipse.equinox.http.servlet" />
-		<file name="org.eclipse.equinox.p2.touchpoint.eclipse" />
-		<file name="org.eclipse.equinox.p2.touchpoint.natives" />
-		<file name="org.apache.lucene" />
+	<property name="depsDirsProperty"
+		value="org.eclipse.osgi
+		       org.eclipse.equinox.common
+		       org.eclipse.core.jobs
+		       org.eclipse.equinox.registry
+		       org.eclipse.equinox.preferences
+		       org.eclipse.core.runtime.compatibility.auth
+		       org.eclipse.core.contenttype
+		       org.eclipse.equinox.app
+		       org.eclipse.core.runtime
+		       org.eclipse.core.variables
+		       org.eclipse.ant.core
+		       org.eclipse.equinox.p2.core
+		       org.eclipse.equinox.p2.metadata
+		       org.eclipse.equinox.frameworkadmin
+		       org.eclipse.equinox.frameworkadmin.equinox
+		       org.eclipse.equinox.p2.jarprocessor
+		       org.eclipse.equinox.security
+		       org.eclipse.core.net
+		       org.eclipse.equinox.concurrent
+		       org.eclipse.ecf.ssl
+		       org.eclipse.ecf.identity
+		       org.eclipse.ecf
+		       org.eclipse.ecf.filetransfer
+		       org.eclipse.ecf.provider.filetransfer
+		       org.eclipse.ecf.provider.filetransfer.ssl
+		       org.eclipse.ecf.provider.filetransfer.httpclient
+		       org.eclipse.ecf.provider.filetransfer.httpclient.ssl
+		       org.eclipse.equinox.p2.repository
+		       org.eclipse.equinox.p2.artifact.repository
+		       org.eclipse.equinox.p2.metadata.repository
+		       org.eclipse.equinox.simpleconfigurator
+		       org.eclipse.equinox.simpleconfigurator.manipulator
+		       org.eclipse.equinox.p2.publisher
+		       org.eclipse.update.configurator
+		       org.eclipse.core.runtime.compatibility
+		       org.eclipse.equinox.p2.engine
+		       org.eclipse.equinox.p2.director
+		       org.eclipse.equinox.p2.publisher.eclipse
+		       org.eclipse.equinox.p2.repository.tools
+		       org.eclipse.equinox.p2.updatesite
+		       org.eclipse.pde.build
+		       org.eclipse.equinox.launcher
+		       org.eclipse.osgi.services
+		       org.eclipse.equinox.p2.console
+		       org.eclipse.equinox.p2.director.app
+		       org.eclipse.update.core
+		       org.eclipse.equinox.p2.garbagecollector
+		       org.eclipse.core.expressions
+		       org.eclipse.equinox.http.servlet
+		       org.eclipse.equinox.p2.touchpoint.eclipse
+		       org.eclipse.equinox.p2.touchpoint.natives
+		       org.apache.lucene" />
 		<!--
 		<file name="org.eclipse.help" />
 		<file name="org.eclipse.help.base" />
 		-->
-	</filelist>
-	<filelist id="helpDirs" dir="${sdkSource}/plugins">
-		<file name="org.eclipse.equinox.http.jetty_2.0.0" />
-		<file name="org.eclipse.help" />
-		<file name="org.eclipse.help.base" />
-	</filelist>
-	<filelist id="depsDirs2" dir="${sdkSource}/plugins">
-		<file name="org.eclipse.swt.gtk.linux.${buildArch}" />
-		<file name="org.eclipse.core.filesystem" />
-		<file name="org.eclipse.core.resources" />
-		<file name="org.eclipse.core.commands" />
-		<file name="org.eclipse.jface" />
-		<file name="org.eclipse.text" />
-		<file name="org.eclipse.jface.text" />
-		<file name="org.eclipse.team.core" />
-		<file name="org.eclipse.core.filebuffers" />
-		<file name="org.eclipse.debug.core" />
-		<file name="org.eclipse.jdt.core" />
-		<file name="org.eclipse.jdt.debug" />
-		<file name="org.eclipse.jdt.launching" />
-		<file name="org.eclipse.pde.core" />
-		<file name="org.eclipse.pde.api.tools" />
-		<file name="org.eclipse.equinox.event" />
-		<file name="org.eclipse.equinox.util" />
-		<file name="org.eclipse.equinox.ds" />
-	</filelist>
+	<filelist id="depsDirs" dir="${sdkSource}/plugins" files="${depsDirsProperty}"/>
+	
+	<property name="helpDirsProperty"
+		value="org.eclipse.equinox.http.jetty_2.0.0
+		       org.eclipse.help
+		       org.eclipse.help.base" />
+	<filelist id="helpDirs" dir="${sdkSource}/plugins" files="${helpDirsProperty}"/>
+	
+	<property name="depsDirs2Property"
+		value="org.eclipse.swt.gtk.linux.${buildArch}
+		       org.eclipse.core.filesystem
+		       org.eclipse.core.resources
+		       org.eclipse.core.commands
+		       org.eclipse.jface
+		       org.eclipse.text
+		       org.eclipse.jface.text
+		       org.eclipse.team.core
+		       org.eclipse.core.filebuffers
+		       org.eclipse.debug.core
+		       org.eclipse.jdt.core
+		       org.eclipse.jdt.debug
+		       org.eclipse.jdt.launching
+		       org.eclipse.pde.core
+		       org.eclipse.pde.api.tools
+		       org.eclipse.equinox.event
+		       org.eclipse.equinox.util
+		       org.eclipse.equinox.ds"/>
+	<filelist id="depsDirs2" dir="${sdkSource}/plugins" files="${depsDirs2Property}"/>
+	
 	<fileset dir="${sdkSource}/plugins" id="orbitDeps">
 		<include name="org.junit_*/" />
 		<include name="com.ibm.icu_*" />
@@ -165,7 +168,48 @@
 	<target name="generateScripts2">
 		<generateBuildScripts builddirs="depsDirs2" rootdir="../${sdkSource}" />
 	</target>
-	<target name="bootstrap">
+
+	<!-- Java 7 changed the jsr14 javac target so bootstrap to 1.5 -->
+	<target name="jsr14To15ForBootstrap">
+		<!-- Set up a fileset for depsDirs build.xml files -->
+		<pathconvert pathsep="/**/*," refid="depsDirs" property="depsDirsFiles">
+		    <filtermapper>
+		        <replacestring from="${sdkSource}/plugins" to="" />
+		    </filtermapper>
+		</pathconvert>
+		<fileset dir="${sdkSource}/plugins" id="depsDirsBuildXMLs" includes="${depsDirsFiles}/**/*">
+			<include name="**/build.xml" />
+		</fileset>
+
+		<!-- Set up a fileset for helpDirs build.xml files -->
+		<pathconvert pathsep="/**/*," refid="helpDirs" property="helpDirsFiles">
+		    <filtermapper>
+		        <replacestring from="${sdkSource}/plugins" to="" />
+		    </filtermapper>
+		</pathconvert>
+		<fileset dir="${sdkSource}/plugins" id="helpDirsBuildXMLs" includes="${helpDirsFiles}/**/*">
+			<include name="**/build.xml" />
+		</fileset>
+
+		<!-- Set up a fileset for depsDirs2 build.xml files -->
+		<pathconvert pathsep="/**/*," refid="depsDirs2" property="depsDirs2Files">
+		    <filtermapper>
+		        <replacestring from="${sdkSource}/plugins" to="" />
+		    </filtermapper>
+		</pathconvert>
+		<fileset dir="${sdkSource}/plugins" id="depsDirs2BuildXMLs" includes="${depsDirs2Files}/**/*">
+			<include name="**/build.xml" />
+		</fileset>
+
+		<replace token="name="bundleJavacTarget" value="jsr14""
+			value="name="bundleJavacTarget" value="1.5""
+			summary="true">
+			<fileset refid="depsDirsBuildXMLs"/>
+			<fileset refid="helpDirsBuildXMLs"/>
+			<fileset refid="depsDirs2BuildXMLs"/>
+		</replace>
+	</target>
+	<target name="bootstrap" depends="jsr14To15ForBootstrap">
 		<echo message="bootclasspath=${CDC-1.1/Foundation-1.1}" />
 		<subant>
 			<property name="buildId" value="${buildId}" />
@@ -236,6 +280,29 @@
 		</subant>
 		<antcall target="collectBootstrapPlugins" />
 	</target>
+
+	<target name="removeGeneratedBuildXMLs" depends="zipPlugins2">
+		<fileset id="buildXMLsToKeep" dir="${sdkSource}/plugins"
+			excludes="**/org.eclipse.swt.gtk.*/*,
+			**/org.eclipse.update.core.linux/**/*,
+			**/org.eclipse.pde.build/scripts/*,
+			**/org.eclipse.jdt.core/scripts/*,
+			**/org.eclipse.update.core.linux/src/*,
+			**/org.eclipse.jdt.doc.isv/*,
+			**/org.eclipse.swt/*,
+			**/org.eclipse.jdt.doc.user/*"
+		/>
+
+		<delete>
+			<intersect>
+				<fileset refid="depsDirsBuildXMLs"/>
+				<fileset refid="helpDirsBuildXMLs"/>
+				<fileset refid="depsDirs2BuildXMLs"/>
+				<fileset refid="buildXMLsToKeep" />
+			</intersect>
+		</delete>
+	</target>
+
 	<target name="collectBootstrapPlugins">
 		<mkdir dir="bootstrap/plugins" />
 		<copy todir="bootstrap/plugins" flatten="true">
diff --git a/pdebuild/eclipse-pdebuild.sh b/pdebuild/eclipse-pdebuild.sh
index 209f03e..ea14c58 100755
--- a/pdebuild/eclipse-pdebuild.sh
+++ b/pdebuild/eclipse-pdebuild.sh
@@ -123,6 +123,7 @@ sourceDir=$PWD
 buildDir=$PWD/build
 SDK=$buildDir/SDK
 homeDir=$buildDir/home
+workspaceDir=$homeDir/workspace
 datadir=`rpm --eval "%{_libdir}"`
 pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
 
@@ -195,6 +196,11 @@ if [ $dryRun -ne 1 ]; then
     mkdir -p $homeDir
 fi
 
+echo "mkdir -p $workspaceDir"
+if [ $dryRun -ne 1 ]; then
+    mkdir -p $workspaceDir
+fi
+
 if [ -z $featureId ]; then
     findFeatureId
 fi
@@ -267,7 +273,10 @@ launcherJar=$(ls $SDK/plugins | grep "org.eclipse.equinox.launcher_")
 
 if [ $testing != true ]; then
   java -cp $SDK/plugins/${launcherJar} \
+    -Duser.home=$homeDir \
+    $vmArgs \
     org.eclipse.core.launcher.Main \
+    -data $workspaceDir \
     -application org.eclipse.ant.core.antRunner \
     $debugPlatformArgs \
     -Dtype=feature \
@@ -279,15 +288,14 @@ if [ $testing != true ]; then
     $orbitDeps \
     -Dtesting="$testing" \
     $additionalArgs \
-    -f $pdeBuildDir/scripts/build.xml \
-    -vmargs \
-    -Duser.home=$homeDir \
-    $vmArgs
-
+    -f $pdeBuildDir/scripts/build.xml
 else
   echo "\
   java -cp $SDK/plugins/${launcherJar} \
+    -Duser.home=$homeDir \
+    $vmArgs \
     org.eclipse.core.launcher.Main \
+    -data $workspaceDir \
     -application org.eclipse.ant.core.antRunner \
     $debugPlatformArgs \
     -Dtype=feature \
@@ -297,12 +305,9 @@ else
     -DbuildDirectory=$buildDir \
     -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
     $orbitDeps \
-    -Dtesting="$testing" \
+    -Dtesting=\"$testing\" \
     $additionalArgs \
-    -f $pdeBuildDir/scripts/build.xml \
-    -vmargs \
-    -Duser.home=$homeDir \
-    $vmArgs
+    -f $pdeBuildDir/scripts/build.xml
   "
 fi
 
diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
index 412b052..d8b182e 100755
--- a/regenerateBootstrapFiles.sh
+++ b/regenerateBootstrapFiles.sh
@@ -11,12 +11,12 @@ if [ "x$launcherDir"x = 'xx' ]; then
 fi
 
 java -jar \
-$launcherDir/org.eclipse.equinox.launcher_*.jar \
+$launcherDir/plugins/org.eclipse.equinox.launcher_*.jar \
 -debug \
 -consolelog \
--data /home/zx/eclipses/eclipse \
+-data $launcherDir \
 -application org.eclipse.ant.core.antRunner \
 -f pdebuild.xml generateScripts \
 -DskipBase=true \
--DsdkSource=build/eclipse-3.7.0-I20110613-1736-src \
+-DsdkSource=build/eclipse-3.7.0-src \
 2>&1 | tee ./generatePdeBuildScripts.log
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
index fb9bd8d..8da967a 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkInstalledOSGiJars.java
@@ -23,16 +23,12 @@ import java.util.jar.Manifest;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Delete;
-import org.apache.tools.ant.taskdefs.optional.unix.Symlink;
 
-public class SymlinkInstalledOSGiJars extends Task {
+public class SymlinkInstalledOSGiJars extends SymlinkJars {
 
 	private String[] importantManifestEntries = { "Bundle-SymbolicName" };
 
 	private Properties dependencies;
-	private String topLevelDir;
 	
 	// Main method for ant task
     public void execute() throws BuildException {
@@ -104,16 +100,7 @@ public class SymlinkInstalledOSGiJars extends Task {
 			// them and not over-write with what the source drop originally
 			// had.
 			
-			Delete d = new Delete();
-			d.init();
-			d.setFile(fileToSymlink);
-			d.execute();
-			
-			Symlink s = new Symlink();
-			s.init();
-			s.setLink(topLevelDir + "/" + fileToSymlink.getName());
-			s.setResource(matchedJar.getAbsolutePath());
-			s.execute();
+			symlinkJar (fileToSymlink, topLevelDir + "/" + fileToSymlink.getName(), matchedJar);
     	}
     }
 
@@ -215,7 +202,4 @@ public class SymlinkInstalledOSGiJars extends Task {
 		}
 	}
 
-	public void setTopleveldir(String topLevelDir) {
-		this.topLevelDir = topLevelDir;
-	}
 }
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkJars.java
new file mode 100644
index 0000000..d65f933
--- /dev/null
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkJars.java
@@ -0,0 +1,49 @@
+package org.eclipse.linuxtools.eclipsebuild;
+
+import java.io.File;
+
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.taskdefs.Delete;
+import org.apache.tools.ant.taskdefs.optional.unix.Symlink;
+
+public class SymlinkJars extends Task {
+
+	protected String topLevelDir;
+	private boolean copyFiles;
+
+	protected void symlinkJar(File fileToDelete, String fileToSymlink,
+			File matchedJar) {
+
+		// First, delete any existing symlink
+		Delete d = new Delete();
+		d.init();
+		d.setFile(fileToDelete);
+		d.execute();
+
+		if (copyFiles) {
+			// copy file over
+			Copy c = new Copy();
+			c.init();
+			c.setFile(matchedJar);
+			c.setTofile(new File(fileToSymlink));
+			c.execute();
+		} else {
+			// Then make the actual symlink
+			Symlink s = new Symlink();
+			s.init();
+			s.setLink(fileToSymlink);
+			s.setResource(matchedJar.getAbsolutePath());
+			s.execute();
+		}
+	}
+
+	public void setTopleveldir(String topLevelDir) {
+		this.topLevelDir = topLevelDir;
+	}
+
+	public void setCopyFiles(boolean copyFiles) {
+		this.copyFiles = copyFiles;
+	}
+
+}
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java
index fdaaa89..50ca935 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkNonOSGiJars.java
@@ -20,15 +20,11 @@ import java.util.Set;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Delete;
 import org.apache.tools.ant.taskdefs.Mkdir;
-import org.apache.tools.ant.taskdefs.optional.unix.Symlink;
 
-public class SymlinkNonOSGiJars extends Task {
+public class SymlinkNonOSGiJars extends SymlinkJars {
 
 	private Properties dependencies;
-	private String topLevelDir;
 
 	// Main method for ant task
     public void execute() throws BuildException {
@@ -60,18 +56,7 @@ public class SymlinkNonOSGiJars extends Task {
 					m.setDir(new File(topLevelDir + "/" + origLocation).getParentFile());
 					m.execute();
 					
-					// First, delete any existing symlink
-					Delete d = new Delete();
-					d.init();
-					d.setFile(new File(topLevelDir + "/" + origLocation));
-					d.execute();
-					
-					// Then make the actual symlink
-					Symlink s = new Symlink();
-					s.init();
-					s.setLink(topLevelDir + "/" + origLocation);
-					s.setResource(systemFile.getAbsolutePath());
-					s.execute();
+					symlinkJar (new File(topLevelDir + "/" + origLocation), topLevelDir + "/" + origLocation, systemFile);
 				}
 			}
 			if (!matched) {
@@ -99,7 +84,4 @@ public class SymlinkNonOSGiJars extends Task {
 		}
 	}
 
-	public void setTopleveldir(String topLevelDir) {
-		this.topLevelDir = topLevelDir;
-	}
 }
diff --git a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
index f646c35..ddcd96f 100644
--- a/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
+++ b/task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
@@ -23,16 +23,12 @@ import java.util.jar.Manifest;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Delete;
-import org.apache.tools.ant.taskdefs.optional.unix.Symlink;
 
-public class SymlinkOSGiJars extends Task {
+public class SymlinkOSGiJars extends SymlinkJars {
 
 	private String[] importantManifestEntries = { "Bundle-SymbolicName", "Bundle-Version", "Export-Package" };
 
 	private Properties dependencies;
-	private String topLevelDir;
 	private String manifestsDir;
 	
 	// Main method for ant task
@@ -88,19 +84,7 @@ public class SymlinkOSGiJars extends Task {
 				throw new BuildException(noSystemJarMsg);
 			}
 			
-			// First, delete any existing symlink
-			Delete d = new Delete();
-			d.init();
-			
-			d.setFile(new File(topLevelDir + "/" + origLocation));
-			d.execute();
-
-			// Then make the actual symlink
-			Symlink s = new Symlink();
-			s.init();
-			s.setLink(topLevelDir + "/" + origLocation);
-			s.setResource(matchedJar.getAbsolutePath());
-			s.execute();
+			symlinkJar (new File(topLevelDir + "/" + origLocation), topLevelDir + "/" + origLocation, matchedJar);
 		}
     }
 
@@ -202,10 +186,6 @@ public class SymlinkOSGiJars extends Task {
 		}
 	}
 
-	public void setTopleveldir(String topLevelDir) {
-		this.topLevelDir = topLevelDir;
-	}
-	
 	public void setManifests(String manifests) {
 		this.manifestsDir = manifests;
 	}


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.



More information about the pkg-java-commits mailing list